Merge changes I7dcf500e,Iad756c3f,I8e898d86

author Guillaume Lambert <guillaume.lambert@orange.com>

Thu, 1 Sep 2022 16:04:26 +0000 (16:04 +0000)

committer Gerrit Code Review <gerrit@opendaylight.org>

Thu, 1 Sep 2022 16:04:26 +0000 (16:04 +0000)
author Guillaume Lambert <guillaume.lambert@orange.com>
Thu, 1 Sep 2022 16:04:26 +0000 (16:04 +0000)
committer Gerrit Code Review <gerrit@opendaylight.org>
Thu, 1 Sep 2022 16:04:26 +0000 (16:04 +0000)
diff --git a/api/pom.xml b/api/pom.xml

index ff32883bca7998ad33f1a5838196129dc31fe844..409f75c3a8ebe1668e72ab09d7532b36d89285b1 100644 (file)
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/common/pom.xml b/common/pom.xml

index ad5162fb248fe8863c49eb5c340b4b1d2c6ca3cf..d048f18511afc05c8486a3422cb87f104df8800e 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -10,7 +10,7 @@
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
@@ -24,7 +24,7 @@
        <dependency>
          <groupId>org.opendaylight.netconf</groupId>
          <artifactId>netconf-artifacts</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml

index 7441b689577e57ec439446cdb1c6ace78d86120f..9c2fef5bd9c344b753d76c5bea0bd0b77927af2b 100644 (file)
--- a/dmaap-client/pom.xml
+++ b/dmaap-client/pom.xml
@@ -9,7 +9,7 @@
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/features/odl-transportpce-dmaap-client/pom.xml b/features/odl-transportpce-dmaap-client/pom.xml

index 3780b17f37bba7350cfeeb25581a616775927d87..c54cc22ff3a01d73fc60f1a5596d51091d28588e 100644 (file)
--- a/features/odl-transportpce-dmaap-client/pom.xml
+++ b/features/odl-transportpce-dmaap-client/pom.xml
@@ -11,7 +11,7 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>single-feature-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml

index 1a49ff36ce0a4673908e10eee2e2608d189251a9..a8806483cc66c76fb62491dafa19ff78e90b2ba1 100644 (file)
--- a/features/odl-transportpce-inventory/pom.xml
+++ b/features/odl-transportpce-inventory/pom.xml
@@ -9,7 +9,7 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>single-feature-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/features/odl-transportpce-nbinotifications/pom.xml b/features/odl-transportpce-nbinotifications/pom.xml

index 08787e89267b4b2956a42192609402dc4703e5aa..986532a1a8efe41cfa7653653d36a813057dbddc 100644 (file)
--- a/features/odl-transportpce-nbinotifications/pom.xml
+++ b/features/odl-transportpce-nbinotifications/pom.xml
@@ -11,7 +11,7 @@
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>single-feature-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/features/odl-transportpce-swagger/pom.xml b/features/odl-transportpce-swagger/pom.xml

index e0a0b52d70b9b579e61f926fa89480dcfc23fb2a..f7177dce0f57aeac899cf394a34712ec6ddaedf4 100644 (file)
--- a/features/odl-transportpce-swagger/pom.xml
+++ b/features/odl-transportpce-swagger/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>single-feature-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <name>OpenDaylight :: transportpce :: swagger</name>
  
    <properties>
-    <netconf.version>3.0.5</netconf.version>
+    <netconf.version>3.0.6</netconf.version>
      <configfile.directory>etc/opendaylight/karaf</configfile.directory>
    </properties>
  
diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml

index ecbcc1d9914d4a28d4b4e878b35a44240bf09b4f..8be62ebfa5f8c671dfc28c5842592c68e896476f 100644 (file)
--- a/features/odl-transportpce-tapi/pom.xml
+++ b/features/odl-transportpce-tapi/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>single-feature-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml

index 6277da974b5b074a246620d1e21ac89ee1ee3bfc..c60f718badf3c3bf18ee1e0015cdbe54300c94ca 100644 (file)
--- a/features/odl-transportpce/pom.xml
+++ b/features/odl-transportpce/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>single-feature-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <name>OpenDaylight :: transportpce</name>
  
    <properties>
-    <netconf.version>3.0.5</netconf.version>
+    <netconf.version>3.0.6</netconf.version>
      <configfile.directory>etc/opendaylight/karaf</configfile.directory>
    </properties>
  
diff --git a/features/pom.xml b/features/pom.xml

index ba27513339310b842e395798f494f778b2f505d0..06cadb01889d0b51f7b4c0d6182ac6afa02345c0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>odlparent-lite</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/inventory/pom.xml b/inventory/pom.xml

index 2e006f5180a4969e7bb4d5fe3e03875d13f31e7a..067fd05f385e0e0c29cbdbfd5a20ed5bad512f5a 100644 (file)
--- a/inventory/pom.xml
+++ b/inventory/pom.xml
@@ -10,7 +10,7 @@
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/karaf/pom.xml b/karaf/pom.xml

index 3320d128c4ae7ae9ae0538520ac5179518f381ed..7b52d37eb080e77df5706af28d75426dd3e85d8f 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>karaf4-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml

index 552c3c2b0e61e2701ae9d223ae3a0b7f1348c91b..251533de9b395db7aec6756be299a04b3fd568ad 100644 (file)
--- a/nbinotifications/pom.xml
+++ b/nbinotifications/pom.xml
@@ -11,7 +11,7 @@
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml

index fad412145e09268c2307c4a6e92db26ce50c95ef..35fc259bf82c3be17ff969ccbcab7f6469c4ae7f 100644 (file)
--- a/networkmodel/pom.xml
+++ b/networkmodel/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>bundle-parent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
@@ -27,21 +27,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <dependency>
          <groupId>org.opendaylight.yangtools</groupId>
          <artifactId>yangtools-artifacts</artifactId>
-        <version>8.0.6</version>
+        <version>8.0.7</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
        <dependency>
          <groupId>org.opendaylight.mdsal</groupId>
          <artifactId>mdsal-artifacts</artifactId>
-        <version>9.0.4</version>
+        <version>9.0.5</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
        <dependency>
          <groupId>org.opendaylight.netconf</groupId>
          <artifactId>netconf-artifacts</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
diff --git a/olm/pom.xml b/olm/pom.xml

index 0d57d85d1611067e8ea920d18d930831bcc6e9a1..c7db211262c2798617258350a15215ef992c6e53 100644 (file)
--- a/olm/pom.xml
+++ b/olm/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml

index fb9ac77dcce5edab2c8f95726413abb9714f29ba..77b6b40657f6b3fc95948b2fd1700e3e639d9995 100644 (file)
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml

index f509e3d0be87cf8fcc162c90cfdd33c5d39cc05c..8c99b4703cefcc6b61775b7d6aea557e61a333a4 100644 (file)
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
        <dependency>
          <groupId>org.opendaylight.netconf</groupId>
          <artifactId>netconf-artifacts</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml

index 8367cfc0b3e820b19ca37bc792624117f0b8a89e..575d638d353ea06ef831f6f740783e147cb95ced 100644 (file)
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml

index 1270cae798cd69f4ecdb6f2a2268d99f998b6c26..466af01bed134012e4561a0e86fab0fafbd5e7e5 100644 (file)
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml

index 81a5bfbb1db2d163346dd9538de7dca56c3fe629..066b0db61ff727e710ec56298e60b4ba46d878ee 100644 (file)
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/pce/pom.xml b/pce/pom.xml

index 409b815c0ccbc06156c9055b92a0bcc2bd670722..4c5560ef6be0b3f8c36c7b078eb8f9078f7e7bc5 100644 (file)
--- a/pce/pom.xml
+++ b/pce/pom.xml
@@ -14,7 +14,7 @@
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/pom.xml b/pom.xml

index e9c923c5dfc79aa7d3eb8d1b6d8b1752a46d6d59..4c402e98cd52ef64e6e72ae7c94959c86ee25854 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
    <parent>
      <groupId>org.opendaylight.odlparent</groupId>
      <artifactId>odlparent</artifactId>
-    <version>10.0.2</version>
+    <version>10.0.3</version>
      <relativePath/>
    </parent>
  
diff --git a/renderer/pom.xml b/renderer/pom.xml

index c0d26490cc86d37e1588490a834cee33138615c8..88e2f07fc00f1e1210074239d648ada23bf02d82 100644 (file)
--- a/renderer/pom.xml
+++ b/renderer/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml

index 89e1cbe8b31b487f5ff280dadc9a2ad368099cad..e489c3e8a8d905afa4329295a116713e89303df0 100644 (file)
--- a/servicehandler/pom.xml
+++ b/servicehandler/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/tapi/pom.xml b/tapi/pom.xml

index dd4d6deeae286c6000995d10a5157365155b13fc..d5258a99ea16c2e08445d5b83a89edd57518569d 100644 (file)
--- a/tapi/pom.xml
+++ b/tapi/pom.xml
@@ -15,7 +15,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
@@ -29,7 +29,7 @@ Author: Martial Coulibaly <martial.coulibaly@gfi.com> on behalf of Orange
        <dependency>
          <groupId>org.opendaylight.netconf</groupId>
          <artifactId>netconf-artifacts</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml

index 9e821e03b5bda4490a56d42882c2e1903667244c..64b8990bdc069d5d176abecb0293618e07c6f26c 100644 (file)
--- a/tapimodels/pom.xml
+++ b/tapimodels/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
diff --git a/test-common/pom.xml b/test-common/pom.xml

index d539b45403fe268e41dbb3554f852f681debd4de..2a6593e12bd35137e3dc3eba238d670a1b58d4fb 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -12,7 +12,7 @@
    <parent>
      <groupId>org.opendaylight.mdsal</groupId>
      <artifactId>binding-parent</artifactId>
-    <version>9.0.4</version>
+    <version>9.0.5</version>
      <relativePath/>
    </parent>
  
@@ -26,7 +26,7 @@
        <dependency>
          <groupId>org.opendaylight.netconf</groupId>
          <artifactId>netconf-artifacts</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
          <scope>import</scope>
          <type>pom</type>
        </dependency>
diff --git a/tests/sample_configs/NW-for-test-5-4.json b/tests/sample_configs/NW-for-test-5-4.json

new file mode 100644 (file)

index 0000000..1a288a2
--- /dev/null
+++ b/tests/sample_configs/NW-for-test-5-4.json
@@ -0,0 +1,14751 @@
+{
+    "ietf-network:network": [
+        {
+            "network-id": "openroadm-topology",
+            "ietf-network-topology:link": [
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-4",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4443",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-4",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-3-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-4",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4144",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4243",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1114",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1253",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-1-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4134",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-4",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5253",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-4",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-4",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3441",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2114",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2324",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-3-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-3",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2431",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1411",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-1-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-3",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-2-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-5-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-2-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-3",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3431",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5144",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1322",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1312",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5312",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4451",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5152",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2322",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-4",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1413",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-3-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1421",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-1-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5352",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-1-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-4",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-2-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-5-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5453",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3433",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1213",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-4-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-4-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-3-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2421",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3231",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-4-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-1-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-3",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-3",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5451",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-3",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2423",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2213",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-3",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1112",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1314",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-3",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5154",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-4",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-3",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1211",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4233",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2332",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-4",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-4",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-3",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2221",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-4-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-2-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-5-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-4-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4344",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-5-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-3",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3342",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-5-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5411",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-3-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3431",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-5-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-5-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5243",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4241",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-3",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-4",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-3",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-3",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-3-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2223",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-3",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-4-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-3-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-2-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5251",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2122",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4142",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1154",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3334",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3332",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-4",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-1-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-3",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-2-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber2124",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-4",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-2-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-3",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-5-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3223",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3132",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-4",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-3",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-4-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-4-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-2-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4352",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-3",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-3-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-4",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4342",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-2-4-DEG3"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3124",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-4",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-4",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-1-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-4-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-4-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber4441",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-5-3-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-5-4-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber5354",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-3",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-2-3-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-4-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-3-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber3233",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-2-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-4",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-3-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-4-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-1-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-4-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-4-4"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-3-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-1-3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-3-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-3-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-3-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-4",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-5-4-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                }
+            ],
+            "node": [
+                {
+                    "node-id": "XPONDER-3-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-3-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-3-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-3-3",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-3-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-3-4",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-3-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-4-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli44"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-4-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli34"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-4-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli34"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-4-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli44"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-4-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli34"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-4-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli44"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-3-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli33"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-3-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli43"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-4-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli14"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-3-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli23"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-2-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-2-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-2-3",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE2"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-2-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-2-4",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE2"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-2-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-2-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE2"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-2-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-4-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli54"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-3-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli23"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-3-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli23"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-5-3",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-5-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE5"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-5-4",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-5-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE5"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-3-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli13"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-3-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli13"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-1-3",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE1"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-1-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-4-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli24"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-1-4",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE1"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-1-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-5-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE5"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-5-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE5"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-5-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-1-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-1-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-1-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-4-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli44"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-3-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli33"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-3-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli33"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-3-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli53"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-3-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli33"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-3-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli53"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-3-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli53"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-3-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli13"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-4-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli54"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-4-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli24"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-4-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli24"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-4-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli54"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-4-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli24"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-4-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli54"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-4-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli14"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-4-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli14"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-3-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli13"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-3-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli23"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-4-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli14"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-3-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli53"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-4-4",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-4-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-4-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-4-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-4-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-4-3",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE4"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-4-3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-3-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli43"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-4-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-4"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli34"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-3-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli43"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-3-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-3"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli43"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                }
+            ]
+        }
+    ]
+}
diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml

deleted file mode 100644 (file)

index e0f1176..0000000
--- a/tests/sample_configs/NW-for-test-5-4.xml
+++ /dev/null
@@ -1,8580 +0,0 @@
-<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
- <network-id>openroadm-topology</network-id>
-<node>    <node-id>OpenROADM-1-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-    <degree-attributes xmlns="http://org/openroadm/network/topology">
-      <avail-freq-maps>
-        <map-name>cband</map-name>
-        <start-edge-freq>191.325</start-edge-freq>
-        <freq-map-granularity>6.25</freq-map-granularity>
-        <effective-bits>768</effective-bits>
-        <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-        </freq-map>
-      </avail-freq-maps>
-    </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-3-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-3-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-3-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-3</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli13</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-3</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-4-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-4-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-4-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-4</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli14</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-1-4</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-         </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-3-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-3-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-3-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-3</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli23</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-3</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-4-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-4-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-4-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-4</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli24</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////8A
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-2-4</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-3-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-3-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-3-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli33</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-3</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-4-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-4-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-4-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-4</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli34</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-3-4</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-3-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-3-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-3-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-3</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli43</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-3</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-4-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-4-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-4-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-4</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli44</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-4-4</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-3-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-3-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-3-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-3-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-3</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli53</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-3</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-3</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-4-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG1-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-4-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG2-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-4-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-CTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-RX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state> <tp-id>DEG3-TTP-TX</tp-id>  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-4-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-4</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli54</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-RX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-</node>
-<node>        <node-id>XPONDER-5-4</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-4</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1112</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1211</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1213</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2</opposite-link>
-
-    <clfi xmlns="http://org/openroadm/common/network">fiber1312</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1314</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1413</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1411</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1114</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2122</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2221</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2223</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2322</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2324</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2423</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2421</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2124</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>
-        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3132</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3231</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3233</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3332</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3334</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3433</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3431</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3431</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4142</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4241</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4243</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4342</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4344</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4443</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4441</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4144</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-3</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-3-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-3-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-3</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-4</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-4-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-4-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-4</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5152</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5251</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5253</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-3-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5352</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5354</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-4-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5453</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-3-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5451</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5154</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-4-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1421</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2114</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1322</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2213</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2431</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3124</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber2332</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-   <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3223</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3441</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4134</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber3342</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4233</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4451</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5144</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber4352</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5243</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5411</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-4-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1154</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-4-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber5312</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-3-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1253</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-3-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-</network>
-\ No newline at end of file
diff --git a/tests/sample_configs/NW-simple-topology.json b/tests/sample_configs/NW-simple-topology.json

new file mode 100644 (file)

index 0000000..a767c1b
--- /dev/null
+++ b/tests/sample_configs/NW-simple-topology.json
@@ -0,0 +1,8405 @@
+{
+    "ietf-network:network": [
+        {
+            "network-id": "openroadm-topology",
+            "ietf-network-topology:link": [
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1112b",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1112a",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-2",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1211a",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-4-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:clfi": "fiber1211b",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP3-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-5-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-3-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-1-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-2-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-2",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-4-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-4-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-1",
+                        "source-tp": "XPDR-NW2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-RX",
+                        "dest-node": "OpenROADM-1-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG1",
+                        "source-tp": "DEG1-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-5-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-4-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-5-1",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-5-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-3-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX",
+                    "source": {
+                        "source-node": "XPONDER-1-2",
+                        "source-tp": "XPDR-NW5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP5-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG2",
+                        "source-tp": "DEG2-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-RX",
+                        "dest-node": "OpenROADM-2-1-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-1-SRG1",
+                        "source-tp": "SRG1-PP2-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW2-RX",
+                        "dest-node": "XPONDER-1-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-5-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG1",
+                        "source-tp": "DEG1-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-1-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-5-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-3-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-4-2-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-2-SRG1",
+                        "source-tp": "SRG1-PP3-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW3-RX",
+                        "dest-node": "XPONDER-3-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-2-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-1-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-RX",
+                        "dest-node": "OpenROADM-1-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-DEG3",
+                        "source-tp": "DEG3-TTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-TTP-RX",
+                        "dest-node": "OpenROADM-1-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW1-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-3-1-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-RX",
+                        "dest-node": "OpenROADM-3-1-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-SRG1",
+                        "source-tp": "SRG1-CP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX",
+                    "source": {
+                        "source-node": "OpenROADM-4-2-SRG1",
+                        "source-tp": "SRG1-PP4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW4-RX",
+                        "dest-node": "XPONDER-4-2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX",
+                    "source": {
+                        "source-node": "XPONDER-3-1",
+                        "source-tp": "XPDR-NW4-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP4-RX",
+                        "dest-node": "OpenROADM-3-1-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-2-DEG3",
+                        "source-tp": "DEG3-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-RX",
+                        "dest-node": "OpenROADM-2-2-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX",
+                    "source": {
+                        "source-node": "OpenROADM-2-1-SRG1",
+                        "source-tp": "SRG1-PP5-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR-NW5-RX",
+                        "dest-node": "XPONDER-2-1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX",
+                    "source": {
+                        "source-node": "XPONDER-2-2",
+                        "source-tp": "XPDR-NW1-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-RX",
+                        "dest-node": "OpenROADM-2-2-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX",
+                    "source": {
+                        "source-node": "OpenROADM-5-2-DEG2",
+                        "source-tp": "DEG2-CTP-TX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG3-CTP-RX",
+                        "dest-node": "OpenROADM-5-2-DEG3"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                }
+            ],
+            "node": [
+                {
+                    "node-id": "OpenROADM-5-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-3-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-3-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-3-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE3"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-5-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE5"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-5-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-4"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW4-RX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-3"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW3-RX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-1"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW1-RX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-2"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW2-RX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-5"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW5-TX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-1"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW1-TX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-4"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW4-TX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-2"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW2-TX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-3"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW3-TX"
+                            }
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "Client-5"
+                            },
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW5-RX"
+                            }
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW5"
+                            }
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW1"
+                            }
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW2"
+                            }
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW3"
+                            }
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-network-topology:xpdr-client-attributes": {
+                                "tail-equipment-id": "XPDR-NW4"
+                            }
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE5"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-5-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-1-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ]
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ]
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "Transport-underlay",
+                            "node-ref": "XPONDER-1-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-1-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli21"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli41"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-4-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli42"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-4-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-2-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli22"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-2-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli12"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-2-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli32"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-1-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli11"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-1-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-2-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-2-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE2"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-4-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-4-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-4-2",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-4-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE4"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPONDER-2-1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR-NW4-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW1-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW4-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW2-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW3-TX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR-NW5-RX",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "Client-5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-5",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW5"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-3",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW3"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "Client-4",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR-NW4"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "ORANGE2"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPONDER-2-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-DEG3",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG3-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG3-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-2-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-CTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-TTP-RX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli52"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-3-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-3-1"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli31"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "OpenROADM-5-1-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP5-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TX",
+                            "org-openroadm-common-network:tp-type": "SRG-TX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-RX",
+                            "org-openroadm-common-network:tp-type": "SRG-RX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "clli51"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "OpenROADM-5-1"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                }
+            ]
+        }
+    ]
+}
diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml

deleted file mode 100644 (file)

index 6153b97..0000000
--- a/tests/sample_configs/NW-simple-topology.xml
+++ /dev/null
@@ -1,4939 +0,0 @@
-<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
- <network-id>openroadm-topology</network-id>
-<node>    <node-id>OpenROADM-1-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type><administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli11</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>             <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>
-    <node-id>XPONDER-1-1</node-id>
-    <supporting-node>
-        <network-ref>Transport-underlay</network-ref>
-        <node-ref>XPONDER-1-1</node-ref>
-    </supporting-node>
-    <supporting-node>
-        <network-ref>clli-network</network-ref>
-        <node-ref>ORANGE1</node-ref>
-    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-1-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-1-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-1-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-1-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli12</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-1-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-1-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE1</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli21</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>           <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-2-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-2-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-2-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-2-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-2-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli22</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-2-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-2-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE2</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-1-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli31</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>     <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-3-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-3-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-3-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-3-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-3-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli32</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8AAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-3-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-3-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE3</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli41</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-4-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-4-2-DEG1</node-id>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-4-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-4-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-4-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli42</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-4-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-4-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE4</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-1-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG2</node-id>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-1-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-1-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-1</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli51</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>              <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-5-1</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-1</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW1-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-1</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW1</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW2-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-2</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW2</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW3-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-3</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW3</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW4-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-4</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW4</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-RX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>XPDR-NW5-TX</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">Client-5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <tp-id>Client-5</tp-id>
-        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-        <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR-NW5</associated-connection-map-tp>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-</node>
-<node>    <node-id>OpenROADM-5-2-DEG1</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG1-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG2</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG2-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
-<node>    <node-id>OpenROADM-5-2-DEG3</node-id>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-TX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-CTP-RX</tp-id>  <ctp-attributes xmlns="http://org/openroadm/network/topology"></ctp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-CTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-RX</tp-id>  <rx-ttp-attributes xmlns="http://org/openroadm/network/topology"></rx-ttp-attributes>
-  <tp-type xmlns="http://org/openroadm/common/network">DEGREE-RX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-    <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology"> <tp-id>DEG3-TTP-TX</tp-id>  <tx-ttp-attributes xmlns="http://org/openroadm/network/topology"></tx-ttp-attributes>
-    <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TX-TTP</tp-type> <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </termination-point>
-  <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </degree-attributes>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node></node>
-<node>   <node-id>OpenROADM-5-2-SRG1</node-id>     <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <supporting-node><network-ref>openroadm-network</network-ref><node-ref>OpenROADM-5-2</node-ref>    </supporting-node>
-        <supporting-node><network-ref>clli-network</network-ref><node-ref>clli52</node-ref>    </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wAAAAAAAAAA
-                </freq-map>
-            </avail-freq-maps>
-        </srg-attributes>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-RX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">               <tp-id>SRG1-CP-TX</tp-id>  <cp-attributes xmlns="http://org/openroadm/network/topology"></cp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-CP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP1-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP1-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP2-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP2-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP3-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP3-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP4-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP4-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <tp-id>SRG1-PP5-RX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-RX-PP</tp-type>        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">                   <tp-id>SRG1-PP5-TX</tp-id>  <pp-attributes xmlns="http://org/openroadm/network/topology"></pp-attributes>
-   <tp-type xmlns="http://org/openroadm/common/network">SRG-TX-PP</tp-type>               <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</termination-point>
-</node>
-<node>        <node-id>XPONDER-5-2</node-id>
-    <supporting-node><network-ref>openroadm-network</network-ref><node-ref>XPONDER-5-2</node-ref>    </supporting-node>
-    <supporting-node><network-ref>clli-network</network-ref><node-ref>ORANGE5</node-ref>    </supporting-node>
-    <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW1-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-1</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-1</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW1</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW2-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-2</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-2</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW2</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW3-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-3</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-3</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW3</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW4-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-4</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-4</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW4</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-RX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-RX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>XPDR-NW5-TX</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-        <xpdr-network-attributes xmlns="http://org/openroadm/network/topology">
-        <tail-equipment-id>Client-5</tail-equipment-id></xpdr-network-attributes>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5-TX</tail-equipment-id>        </xpdr-client-attributes></termination-point>
-<termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">    <tp-id>Client-5</tp-id>        <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <xpdr-client-attributes xmlns="http://org/openroadm/network/topology">        <tail-equipment-id>XPDR-NW5</tail-equipment-id>        </xpdr-client-attributes> </termination-point>
-</node>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-1-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-1-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-1-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-1-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-1-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-1-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-1-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1112a</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1211a</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1211b</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2</opposite-link>
-    <clfi xmlns="http://org/openroadm/common/network">fiber1112b</clfi>
-    <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-2-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-2-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-2-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-2-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-2-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-2-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-2-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-3-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-3-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-3-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-3-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-3-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-3-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-3-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-4-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-4-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-4-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-4-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-4-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-4-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-4-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-5-1</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-1-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-5-1-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-5-1</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX</link-id>
-        <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-CTP-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-CP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-CTP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-        <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">            <link-id>OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX</link-id>
-            <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-CTP-TX</source-tp></source>            <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-CP-RX</dest-tp></destination>
-            <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX</opposite-link>
-            <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW1-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP1-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW1-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW2-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP2-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW2-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW3-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP3-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW3-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW4-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP4-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW4-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</link-id>
-        <source><source-node>XPONDER-5-2</source-node><source-tp>XPDR-NW5-TX</source-tp></source>        <destination><dest-node>OpenROADM-5-2-SRG1</dest-node><dest-tp>SRG1-PP5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</opposite-link>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">        <link-id>OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX</link-id>
-        <source><source-node>OpenROADM-5-2-SRG1</source-node><source-tp>SRG1-PP5-TX</source-tp></source>        <destination><dest-node>XPONDER-5-2</dest-node><dest-tp>XPDR-NW5-RX</dest-tp></destination>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX</opposite-link>
-       <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state></link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-2-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG1</source-node><source-tp>DEG1-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-1-DEG1</dest-node><dest-tp>DEG1-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-1-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG2</source-node><source-tp>DEG2-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-2-DEG2</dest-node><dest-tp>DEG2-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-2-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-2-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-3-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-3-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-4-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-4-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-5-2-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-1-1-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-<link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-    <link-id>OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3</link-id>
-    <opposite-link xmlns="http://org/openroadm/common/network">OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3</opposite-link>
-    <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-    <source><source-node>OpenROADM-1-1-DEG3</source-node><source-tp>DEG3-TTP-TX</source-tp></source>
-    <destination><dest-node>OpenROADM-5-2-DEG3</dest-node><dest-tp>DEG3-TTP-RX</dest-tp></destination>
-    <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-    <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-    <OMS-attributes xmlns="http://org/openroadm/network/topology">
-        <span>
-            <auto-spanloss>true</auto-spanloss>
-            <spanloss-base>11.4</spanloss-base>
-            <spanloss-current>12</spanloss-current>
-            <engineered-spanloss>12.2</engineered-spanloss>
-            <link-concatenation>
-                <SRLG-Id>0</SRLG-Id>
-                <fiber-type>smf</fiber-type>
-                <SRLG-length>100000</SRLG-length>
-                <pmd>0.5</pmd>
-            </link-concatenation>
-        </span>
-    </OMS-attributes>
-</link>
-</network>
-\ No newline at end of file
diff --git a/tests/sample_configs/honeynode-topo.json b/tests/sample_configs/honeynode-topo.json

new file mode 100644 (file)

index 0000000..9ed69ba
--- /dev/null
+++ b/tests/sample_configs/honeynode-topo.json
@@ -0,0 +1,860 @@
+{
+    "ietf-network:network": [
+        {
+            "network-id": "openroadm-topology",
+            "network-types": {
+                "org-openroadm-common-network:openroadm-common-network": {}
+            },
+            "node": [
+                {
+                    "node-id": "ROADMC01-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-TTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADMC01"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPDRC01-XPDR1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR1-CLIENT1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-NETWORK1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR1-CLIENT2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-NETWORK2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR1-NETWORK2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-CLIENT2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR1-NETWORK1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-CLIENT1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPDRC01"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "ROADMC01-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADMC01"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "ROADMA01-DEG1",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADMA01"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "XPDRA01-XPDR1",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR1-CLIENT1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-NETWORK1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR1-CLIENT2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-NETWORK2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR1-NETWORK2",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-CLIENT2"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "XPDR1-NETWORK1",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-CLIENT1"
+                            ],
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPDRA01"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "ROADMA01-DEG2",
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-TTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TXRX",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADMA01"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "ROADMC01-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP10-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP9-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP16-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP6-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP13-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP7-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP12-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP15-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP11-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP8-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP14-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADMC01"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                },
+                {
+                    "node-id": "ROADMA01-SRG1",
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "start-edge-freq": "191.32500000",
+                                "effective-bits": 768,
+                                "freq-map-granularity": "6.25000",
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP10-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP9-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP16-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP6-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP13-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP4-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP7-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP12-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP15-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP11-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP8-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP14-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP5-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TXRX",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADMA01"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        }
+                    ],
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService"
+                }
+            ],
+            "ietf-network-topology:link": [
+                {
+                    "link-id": "ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADMA01-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1",
+                    "source": {
+                        "source-node": "ROADMC01-SRG1",
+                        "source-tp": "SRG1-PP1-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR1-NETWORK1",
+                        "dest-node": "XPDRC01-XPDR1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADMA01-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADMC01-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADMC01-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADMA01-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADMC01-DEG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1",
+                    "source": {
+                        "source-node": "ROADMA01-SRG1",
+                        "source-tp": "SRG1-PP1-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "XPDR1-NETWORK1",
+                        "dest-node": "XPDRA01-XPDR1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT"
+                },
+                {
+                    "link-id": "ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADMC01-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADMA01-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADMA01-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX",
+                    "source": {
+                        "source-node": "XPDRA01-XPDR1",
+                        "source-tp": "XPDR1-NETWORK1"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-TXRX",
+                        "dest-node": "ROADMA01-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADMC01-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK"
+                },
+                {
+                    "link-id": "XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX",
+                    "source": {
+                        "source-node": "XPDRC01-XPDR1",
+                        "source-tp": "XPDR1-NETWORK1"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-TXRX",
+                        "dest-node": "ROADMC01-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT"
+                },
+                {
+                    "link-id": "ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADMC01-SRG1"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "DROP-LINK"
+                },
+                {
+                    "link-id": "ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADMA01-DEG2"
+                    },
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-type": "ADD-LINK"
+                },
+                {
+                    "link-id": "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMA01-DEG1",
+                        "source-tp": "DEG1-TTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG2-TTP-TXRX",
+                        "dest-node": "ROADMC01-DEG2"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-latency": 0,
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX",
+                    "org-openroadm-common-network:clfi": "fiberA01C01",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                },
+                {
+                    "link-id": "ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX",
+                    "source": {
+                        "source-node": "ROADMC01-DEG2",
+                        "source-tp": "DEG2-TTP-TXRX"
+                    },
+                    "destination": {
+                        "dest-tp": "DEG1-TTP-TXRX",
+                        "dest-node": "ROADMA01-DEG1"
+                    },
+                    "org-openroadm-common-network:TE-metric": 10,
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "org-openroadm-common-network:link-latency": 0,
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX",
+                    "org-openroadm-common-network:clfi": "fiberC01A01",
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "engineered-spanloss": "12.200",
+                            "spanloss-base": "11.400",
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": "0.50",
+                                    "SRLG-length": "100000.0"
+                                }
+                            ],
+                            "auto-spanloss": true,
+                            "spanloss-current": "12.0"
+                        }
+                    }
+                }
+            ]
+        }
+    ]
+}
diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml

deleted file mode 100644 (file)

index 67eeadb..0000000
--- a/tests/sample_configs/honeynode-topo.xml
+++ /dev/null
@@ -1,794 +0,0 @@
-<network xmlns="urn:ietf:params:xml:ns:yang:ietf-network">
-    <network-id>openroadm-topology</network-id>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA01-DEG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-DEG2</source-node>
-            <source-tp>DEG2-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC01-DEG2</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-SRG1</source-node>
-            <source-tp>SRG1-CP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA01-DEG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-SRG1</source-node>
-            <source-tp>SRG1-CP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>SRG1-PP1-TXRX</dest-tp>
-            <dest-node>ROADMA01-SRG1</dest-node>
-        </destination>
-        <source>
-            <source-node>XPDRA01-XPDR1</source-node>
-            <source-tp>XPDR1-NETWORK1</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA01-DEG2</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-DEG1</source-node>
-            <source-tp>DEG1-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC01-DEG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-DEG2</source-node>
-            <source-tp>DEG2-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC01-DEG2</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-DEG1</source-node>
-            <source-tp>DEG1-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">EXPRESS-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMA01-SRG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-DEG1</source-node>
-            <source-tp>DEG1-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMA01-SRG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-DEG2</source-node>
-            <source-tp>DEG2-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <clfi xmlns="http://org/openroadm/common/network">fiberA01C01</clfi>
-        <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-        <destination>
-            <dest-tp>DEG2-TTP-TXRX</dest-tp>
-            <dest-node>ROADMC01-DEG2</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-DEG1</source-node>
-            <source-tp>DEG1-TTP-TXRX</source-tp>
-        </source>
-        <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <span>
-                <auto-spanloss>true</auto-spanloss>
-                <spanloss-base>11.4</spanloss-base>
-                <spanloss-current>12</spanloss-current>
-                <engineered-spanloss>12.2</engineered-spanloss>
-                <link-concatenation>
-                    <SRLG-Id>0</SRLG-Id>
-                    <fiber-type>smf</fiber-type>
-                    <SRLG-length>100000</SRLG-length>
-                    <pmd>0.5</pmd>
-                </link-concatenation>
-            </span>
-        </OMS-attributes>
-        <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-        <link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>XPDR1-NETWORK1</dest-tp>
-            <dest-node>XPDRA01-XPDR1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-SRG1</source-node>
-            <source-tp>SRG1-PP1-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <clfi xmlns="http://org/openroadm/common/network">fiberC01A01</clfi>
-        <TE-metric xmlns="http://org/openroadm/common/network">10</TE-metric>
-        <destination>
-            <dest-tp>DEG1-TTP-TXRX</dest-tp>
-            <dest-node>ROADMA01-DEG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-DEG2</source-node>
-            <source-tp>DEG2-TTP-TXRX</source-tp>
-        </source>
-        <OMS-attributes xmlns="http://org/openroadm/network/topology">
-            <span>
-                <auto-spanloss>true</auto-spanloss>
-                <spanloss-base>11.4</spanloss-base>
-                <spanloss-current>12</spanloss-current>
-                <engineered-spanloss>12.2</engineered-spanloss>
-                <link-concatenation>
-                    <SRLG-Id>0</SRLG-Id>
-                    <fiber-type>smf</fiber-type>
-                    <SRLG-length>100000</SRLG-length>
-                    <pmd>0.5</pmd>
-                </link-concatenation>
-            </span>
-        </OMS-attributes>
-        <link-type xmlns="http://org/openroadm/common/network">ROADM-TO-ROADM</link-type>
-        <link-latency xmlns="http://org/openroadm/common/network">0</link-latency>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMC01-SRG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-DEG1</source-node>
-            <source-tp>DEG1-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG1-CTP-TXRX</dest-tp>
-            <dest-node>ROADMC01-DEG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-SRG1</source-node>
-            <source-tp>SRG1-CP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>SRG1-CP-TXRX</dest-tp>
-            <dest-node>ROADMC01-SRG1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-DEG2</source-node>
-            <source-tp>DEG2-CTP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">DROP-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>XPDR1-NETWORK1</dest-tp>
-            <dest-node>XPDRC01-XPDR1</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMC01-SRG1</source-node>
-            <source-tp>SRG1-PP1-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-INPUT</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>DEG2-CTP-TXRX</dest-tp>
-            <dest-node>ROADMA01-DEG2</dest-node>
-        </destination>
-        <source>
-            <source-node>ROADMA01-SRG1</source-node>
-            <source-tp>SRG1-CP-TXRX</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">ADD-LINK</link-type>
-    </link>
-    <link xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-        <link-id>XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX</link-id>
-        <opposite-link xmlns="http://org/openroadm/common/network">ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1</opposite-link>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <destination>
-            <dest-tp>SRG1-PP1-TXRX</dest-tp>
-            <dest-node>ROADMC01-SRG1</dest-node>
-        </destination>
-        <source>
-            <source-node>XPDRC01-XPDR1</source-node>
-            <source-tp>XPDR1-NETWORK1</source-tp>
-        </source>
-        <link-type xmlns="http://org/openroadm/common/network">XPONDER-OUTPUT</link-type>
-    </link>
-    <network-types>
-        <openroadm-common-network xmlns="http://org/openroadm/common/network"></openroadm-common-network>
-    </network-types>
-    <node>
-        <node-id>ROADMC01-SRG1</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP12-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP15-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP5-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP8-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP6-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP9-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP10-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP14-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP16-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP7-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP11-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP13-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMC01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeC</node-ref>
-        </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </srg-attributes>
-        <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    </node>
-    <node>
-        <node-id>ROADMC01-DEG1</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG1-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG1-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMC01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeC</node-ref>
-        </supporting-node>
-        <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <degree-number>1</degree-number>
-           <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    </node>
-    <node>
-        <node-id>ROADMC01-DEG2</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG2-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG2-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMC01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeC</node-ref>
-        </supporting-node>
-        <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <degree-number>2</degree-number>
-        <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    </node>
-    <node>
-        <node-id>ROADMA01-SRG1</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP12-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP15-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP1-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP2-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-CP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-CP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP5-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP8-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP6-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP9-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP3-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP10-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP14-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP16-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP7-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP11-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP13-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>SRG1-PP4-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">SRG-TXRX-PP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMA01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeA</node-ref>
-        </supporting-node>
-        <srg-attributes xmlns="http://org/openroadm/network/topology">
-        <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </srg-attributes>
-        <node-type xmlns="http://org/openroadm/common/network">SRG</node-type>
-    </node>
-    <node>
-        <node-id>XPDRA01-XPDR1</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-NETWORK2</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-CLIENT2</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-CLIENT1</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-NETWORK1</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>XPDRA01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeA</node-ref>
-        </supporting-node>
-    </node>
-    <node>
-        <node-id>ROADMA01-DEG2</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG2-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG2-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMA01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeA</node-ref>
-        </supporting-node>
-        <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <degree-number>2</degree-number>
-         <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    </node>
-    <node>
-        <node-id>XPDRC01-XPDR1</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-NETWORK2</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT2</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-CLIENT2</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK2</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-CLIENT1</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-CLIENT</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-NETWORK1</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>XPDR1-NETWORK1</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">XPONDER-NETWORK</tp-type>
-            <associated-connection-map-tp xmlns="http://org/openroadm/common/network">XPDR1-CLIENT1</associated-connection-map-tp>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <node-type xmlns="http://org/openroadm/common/network">XPONDER</node-type>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>XPDRC01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeC</node-ref>
-        </supporting-node>
-    </node>
-    <node>
-        <node-id>ROADMA01-DEG1</node-id>
-        <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-        <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG1-CTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-CTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <termination-point xmlns="urn:ietf:params:xml:ns:yang:ietf-network-topology">
-            <tp-id>DEG1-TTP-TXRX</tp-id>
-            <tp-type xmlns="http://org/openroadm/common/network">DEGREE-TXRX-TTP</tp-type>
-            <administrative-state xmlns="http://org/openroadm/common/network">inService</administrative-state>
-            <operational-state xmlns="http://org/openroadm/common/network">inService</operational-state>
-        </termination-point>
-        <node-type xmlns="http://org/openroadm/common/network">DEGREE</node-type>
-        <supporting-node>
-            <network-ref>openroadm-network</network-ref>
-            <node-ref>ROADMA01</node-ref>
-        </supporting-node>
-        <supporting-node>
-            <network-ref>clli-network</network-ref>
-            <node-ref>NodeA</node-ref>
-        </supporting-node>
-        <degree-attributes xmlns="http://org/openroadm/network/topology">
-            <degree-number>1</degree-number>
-            <avail-freq-maps>
-                <map-name>cband</map-name>
-                <start-edge-freq>191.325</start-edge-freq>
-                <freq-map-granularity>6.25</freq-map-granularity>
-                <effective-bits>768</effective-bits>
-                <freq-map>////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                </freq-map>
-            </avail-freq-maps>s>
-        </degree-attributes>
-    </node>
-</network>
diff --git a/tests/sample_configs/honeynode-topo400G.json b/tests/sample_configs/honeynode-topo400G.json

index 12b66cdc85b66ecc25d58c351ecab6f0b9cd3092..6706f15c32ba0277551db9d301a7c63fe701f04d 100644 (file)
--- a/tests/sample_configs/honeynode-topo400G.json
+++ b/tests/sample_configs/honeynode-topo400G.json
@@ -910,4 +910,4 @@
              ]
          }
      ]
-}
-\ No newline at end of file
+}
diff --git a/tests/sample_configs/pce_portmapping_121.json b/tests/sample_configs/pce_portmapping_121.json

index 7e877b30fa7a2536d388f513f8110af78f9f723b..1f22bd570a5f53e5b99d62ff82c737a10da6e454 100644 (file)
--- a/tests/sample_configs/pce_portmapping_121.json
+++ b/tests/sample_configs/pce_portmapping_121.json
@@ -1,704 +1,704 @@
  {
-  "nodes": [
-    {
-      "node-id": "OpenROADM-1-1",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "XPONDER-1-1",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-1-2",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-1-2",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [
-        {
-          "logical-connection-point": "XPDR1-CLIENT1",
-          "port-qual": "xpdr-client"
+    "nodes": [
+        {
+            "node-id": "OpenROADM-1-1",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-1-1",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-1-2",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-1-2",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-qual": "xpdr-client"
+                }
+            ],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-1-3",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-1-3",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-1-4",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-1-4",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-2-1",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-2-1",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-2-2",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-2-2",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-qual": "xpdr-client"
+                }
+            ],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-2-3",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-2-3",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-2-4",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-2-4",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-3-1",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-3-1",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-3-2",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-3-2",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-qual": "xpdr-client"
+                }
+            ],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-3-3",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-3-3",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-3-4",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-3-4",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-4-1",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-4-1",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-4-2",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-4-2",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-4-3",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-4-3",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-4-4",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-4-4",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-5-1",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-5-1",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-5-2",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-5-2",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-5-3",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-5-3",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "OpenROADM-5-4",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER-5-4",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPDRC01",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-qual": "xpdr-client"
+                }
+            ],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "ROADMA01",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "ROADMC01",
+            "node-info": {
+                "node-type": "rdm",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPDRA01",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-qual": "xpdr-client"
+                }
+            ],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
+        },
+        {
+            "node-id": "XPONDER",
+            "node-info": {
+                "node-type": "xpdr",
+                "openroadm-version": "1.2.1",
+                "node-clli": "NodeX",
+                "node-vendor": "vendorA",
+                "node-model": "model1",
+                "node-ip-address": "1.2.3.4"
+            },
+            "mapping": [],
+            "mc-capabilities": [],
+            "cp-to-degree": [],
+            "switching-pool-lcp": []
          }
-      ],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-1-3",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-1-3",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-1-4",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-1-4",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-2-1",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-2-1",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-2-2",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-2-2",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [
-        {
-          "logical-connection-point": "XPDR1-CLIENT1",
-          "port-qual": "xpdr-client"
-        }
-      ],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-2-3",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-2-3",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-2-4",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-2-4",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-3-1",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-3-1",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-3-2",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-3-2",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [
-        {
-          "logical-connection-point": "XPDR1-CLIENT1",
-          "port-qual": "xpdr-client"
-        }
-      ],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-3-3",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-3-3",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-3-4",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-3-4",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-4-1",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-4-1",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-4-2",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-4-2",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-4-3",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-4-3",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-4-4",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-4-4",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-5-1",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-5-1",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-5-2",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-5-2",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "OpenROADM-5-3",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-        {
-      "node-id": "XPONDER-5-3",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "OpenROADM-5-4",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "XPONDER-5-4",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "XPDRC01",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [
-        {
-          "logical-connection-point": "XPDR1-CLIENT1",
-          "port-qual": "xpdr-client"
-        }
-      ],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "ROADMA01",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "ROADMC01",
-      "node-info": {
-        "node-type": "rdm",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "XPDRA01",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [
-        {
-          "logical-connection-point": "XPDR1-CLIENT1",
-          "port-qual": "xpdr-client"
-        }
-      ],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    },
-    {
-      "node-id": "XPONDER",
-      "node-info": {
-        "node-type": "xpdr",
-        "openroadm-version": "1.2.1",
-        "node-clli": "NodeX",
-        "node-vendor": "vendorA",
-        "node-model": "model1",
-        "node-ip-address": "1.2.3.4"
-      },
-      "mapping": [],
-      "mc-capabilities": [],
-      "cp-to-degree": [],
-      "switching-pool-lcp": []
-    }
-  ]
-}
-\ No newline at end of file
+    ]
+}
diff --git a/tests/sample_configs/pce_portmapping_71.json b/tests/sample_configs/pce_portmapping_71.json

index 377bde837913c091b85feaa7291e1fb52a1ba43a..f08c4d0be408d2f26891dc8780c2b1fe04ab718b 100644 (file)
--- a/tests/sample_configs/pce_portmapping_71.json
+++ b/tests/sample_configs/pce_portmapping_71.json
@@ -1,493 +1,491 @@
  {
-    "network": {
-        "nodes": [
-            {
-                "node-id": "XPDR-A2",
-                "node-info": {
-                    "node-clli": "NodeA",
-                    "node-vendor": "vendorA",
-                    "openroadm-version": "7.1",
-                    "node-ip-address": "1.2.3.4",
-                    "node-type": "xpdr",
-                    "node-model": "model"
-                },
-                "switching-pool-lcp": [
-                    {
-                        "switching-pool-number": 1,
-                        "switching-pool-type": "blocking",
-                        "non-blocking-list": [
-                            {
-                                "nbl-number": 2,
-                                "lcp-list": [
-                                    "XPDR2-NETWORK1",
-                                    "XPDR2-CLIENT2"
-                                ],
-                                "interconnect-bandwidth": 0
-                            },
-                            {
-                                "nbl-number": 1,
-                                "lcp-list": [
-                                    "XPDR2-CLIENT1",
-                                    "XPDR2-NETWORK1"
-                                ],
-                                "interconnect-bandwidth": 0
-                            }
-                        ]
-                    }
-                ],
-                "mapping": [
-                    {
-                        "logical-connection-point": "XPDR2-CLIENT1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/2/1/1-PLUG-CLIENT",
-                        "mpdr-restrictions": {
-                            "min-trib-slot": "1.1",
-                            "max-trib-slot": "1.20"
-                        },
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-100GE-ODU4",
-                            "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-                        ],
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "lcp-hash-val": "AK+Cna4EclRH",
-                        "supporting-port": "C1",
-                        "port-qual": "switch-client"
-                    },
-                    {
-                        "logical-connection-point": "XPDR1-NETWORK1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/1/2-PLUG-NET",
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-otsi-otsigroup"
-                        ],
-                        "port-oper-state": "InService",
-                        "connection-map-lcp": "XPDR1-CLIENT1",
-                        "port-direction": "bidirectional",
-                        "xponder-type": "tpdr",
-                        "lcp-hash-val": "AIGiVAQ4gDil",
-                        "supporting-port": "L1",
-                        "port-qual": "xpdr-network"
-                    },
-                    {
-                        "logical-connection-point": "XPDR2-CLIENT2",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/2/1/2-PLUG-CLIENT",
-                        "mpdr-restrictions": {
-                            "min-trib-slot": "2.1",
-                            "max-trib-slot": "2.20"
+    "nodes": [
+        {
+            "node-id": "XPDR-A2",
+            "node-info": {
+                "node-clli": "NodeA",
+                "node-vendor": "vendorA",
+                "openroadm-version": "7.1",
+                "node-ip-address": "1.2.3.4",
+                "node-type": "xpdr",
+                "node-model": "model"
+            },
+            "switching-pool-lcp": [
+                {
+                    "switching-pool-number": 1,
+                    "switching-pool-type": "blocking",
+                    "non-blocking-list": [
+                        {
+                            "nbl-number": 2,
+                            "lcp-list": [
+                                "XPDR2-NETWORK1",
+                                "XPDR2-CLIENT2"
+                            ],
+                            "interconnect-bandwidth": 0
                          },
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-100GE-ODU4",
-                            "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-                        ],
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "lcp-hash-val": "AK+Cna4EclRE",
-                        "supporting-port": "C1",
-                        "port-qual": "switch-client"
-                    },
-                    {
-                        "logical-connection-point": "XPDR1-CLIENT1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/1/1-PLUG-CLIENT",
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-400GE"
-                        ],
-                        "port-oper-state": "InService",
-                        "connection-map-lcp": "XPDR1-NETWORK1",
-                        "port-direction": "bidirectional",
-                        "lcp-hash-val": "AODABTVSOHH0",
-                        "supporting-port": "C1",
-                        "port-qual": "xpdr-client"
-                    },
-                    {
-                        "logical-connection-point": "XPDR2-NETWORK1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/2/2-PLUG-NET",
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-otsi-otsigroup"
-                        ],
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "xponder-type": "mpdr",
-                        "lcp-hash-val": "LY9PxYJqUbw=",
-                        "supporting-port": "L1",
-                        "port-qual": "switch-network"
-                    }
-                ],
-                "mc-capabilities": [
-                    {
-                        "mc-node-name": "XPDR-mcprofile",
-                        "center-freq-granularity": 3.125,
-                        "slot-width-granularity": 6.25
-                    }
-                ]
+                        {
+                            "nbl-number": 1,
+                            "lcp-list": [
+                                "XPDR2-CLIENT1",
+                                "XPDR2-NETWORK1"
+                            ],
+                            "interconnect-bandwidth": 0
+                        }
+                    ]
+                }
+            ],
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR2-CLIENT1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/2/1/1-PLUG-CLIENT",
+                    "mpdr-restrictions": {
+                        "min-trib-slot": "1.1",
+                        "max-trib-slot": "1.20"
+                    },
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-100GE-ODU4",
+                        "org-openroadm-port-types:if-OCH-OTU4-ODU4"
+                    ],
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "lcp-hash-val": "AK+Cna4EclRH",
+                    "supporting-port": "C1",
+                    "port-qual": "switch-client"
+                },
+                {
+                    "logical-connection-point": "XPDR1-NETWORK1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/1/2-PLUG-NET",
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-otsi-otsigroup"
+                    ],
+                    "port-oper-state": "InService",
+                    "connection-map-lcp": "XPDR1-CLIENT1",
+                    "port-direction": "bidirectional",
+                    "xponder-type": "tpdr",
+                    "lcp-hash-val": "AIGiVAQ4gDil",
+                    "supporting-port": "L1",
+                    "port-qual": "xpdr-network"
+                },
+                {
+                    "logical-connection-point": "XPDR2-CLIENT2",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/2/1/2-PLUG-CLIENT",
+                    "mpdr-restrictions": {
+                        "min-trib-slot": "2.1",
+                        "max-trib-slot": "2.20"
+                    },
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-100GE-ODU4",
+                        "org-openroadm-port-types:if-OCH-OTU4-ODU4"
+                    ],
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "lcp-hash-val": "AK+Cna4EclRE",
+                    "supporting-port": "C1",
+                    "port-qual": "switch-client"
+                },
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/1/1-PLUG-CLIENT",
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-400GE"
+                    ],
+                    "port-oper-state": "InService",
+                    "connection-map-lcp": "XPDR1-NETWORK1",
+                    "port-direction": "bidirectional",
+                    "lcp-hash-val": "AODABTVSOHH0",
+                    "supporting-port": "C1",
+                    "port-qual": "xpdr-client"
+                },
+                {
+                    "logical-connection-point": "XPDR2-NETWORK1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/2/2-PLUG-NET",
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-otsi-otsigroup"
+                    ],
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "xponder-type": "mpdr",
+                    "lcp-hash-val": "LY9PxYJqUbw=",
+                    "supporting-port": "L1",
+                    "port-qual": "switch-network"
+                }
+            ],
+            "mc-capabilities": [
+                {
+                    "mc-node-name": "XPDR-mcprofile",
+                    "center-freq-granularity": 3.125,
+                    "slot-width-granularity": 6.25
+                }
+            ]
+        },
+        {
+            "node-id": "ROADM-C1",
+            "node-info": {
+                "node-clli": "NodeC",
+                "node-vendor": "vendorA",
+                "openroadm-version": "2.2.1",
+                "node-ip-address": "127.0.0.13",
+                "node-type": "rdm",
+                "node-model": "model2"
              },
-            {
-                "node-id": "ROADM-C1",
-                "node-info": {
-                    "node-clli": "NodeC",
-                    "node-vendor": "vendorA",
-                    "openroadm-version": "2.2.1",
-                    "node-ip-address": "127.0.0.13",
-                    "node-type": "rdm",
-                    "node-model": "model2"
-                },
-                "cp-to-degree": [
-                    {
-                        "circuit-pack-name": "1/0/ETH-PLUG",
-                        "degree-number": 1,
-                        "interface-name": "1GE-interface-1"
-                    },
-                    {
-                        "circuit-pack-name": "2/0",
-                        "degree-number": 2,
-                        "interface-name": "1GE-interface-2"
-                    },
-                    {
-                        "circuit-pack-name": "2/0/ETH-PLUG",
-                        "degree-number": 2,
-                        "interface-name": "1GE-interface-2"
-                    },
-                    {
-                        "circuit-pack-name": "1/0",
-                        "degree-number": 1,
-                        "interface-name": "1GE-interface-1"
-                    }
-                ],
-                "mapping": [
-                    {
-                        "logical-connection-point": "SRG1-PP2-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C2",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP4-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C4",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "DEG2-TTP-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "2/0",
-                        "supporting-port": "L1",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP3-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C3",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "DEG1-TTP-TXRX",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/0",
-                        "supporting-ots": "OTS-DEG1-TTP-TXRX",
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "supporting-port": "L1",
-                        "supporting-oms": "OMS-DEG1-TTP-TXRX"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP1-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C1",
-                        "port-oper-state": "InService"
-                    }
-                ],
-                "mc-capabilities": [
-                    {
-                        "mc-node-name": "DEG2-TTP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    },
-                    {
-                        "mc-node-name": "DEG1-TTP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    },
-                    {
-                        "mc-node-name": "SRG1-PP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    }
-                ]
+            "cp-to-degree": [
+                {
+                    "circuit-pack-name": "1/0/ETH-PLUG",
+                    "degree-number": 1,
+                    "interface-name": "1GE-interface-1"
+                },
+                {
+                    "circuit-pack-name": "2/0",
+                    "degree-number": 2,
+                    "interface-name": "1GE-interface-2"
+                },
+                {
+                    "circuit-pack-name": "2/0/ETH-PLUG",
+                    "degree-number": 2,
+                    "interface-name": "1GE-interface-2"
+                },
+                {
+                    "circuit-pack-name": "1/0",
+                    "degree-number": 1,
+                    "interface-name": "1GE-interface-1"
+                }
+            ],
+            "mapping": [
+                {
+                    "logical-connection-point": "SRG1-PP2-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C2",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP4-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C4",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "DEG2-TTP-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "2/0",
+                    "supporting-port": "L1",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP3-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C3",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "DEG1-TTP-TXRX",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/0",
+                    "supporting-ots": "OTS-DEG1-TTP-TXRX",
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "supporting-port": "L1",
+                    "supporting-oms": "OMS-DEG1-TTP-TXRX"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP1-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C1",
+                    "port-oper-state": "InService"
+                }
+            ],
+            "mc-capabilities": [
+                {
+                    "mc-node-name": "DEG2-TTP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                },
+                {
+                    "mc-node-name": "DEG1-TTP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                },
+                {
+                    "mc-node-name": "SRG1-PP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                }
+            ]
+        },
+        {
+            "node-id": "XPDR-C2",
+            "node-info": {
+                "node-clli": "NodeC",
+                "node-vendor": "vendorA",
+                "openroadm-version": "7.1",
+                "node-ip-address": "1.2.3.4",
+                "node-type": "xpdr",
+                "node-model": "model"
              },
-            {
-                "node-id": "XPDR-C2",
-                "node-info": {
-                    "node-clli": "NodeC",
-                    "node-vendor": "vendorA",
-                    "openroadm-version": "7.1",
-                    "node-ip-address": "1.2.3.4",
-                    "node-type": "xpdr",
-                    "node-model": "model"
-                },
-                "switching-pool-lcp": [
-                    {
-                        "switching-pool-number": 1,
-                        "switching-pool-type": "blocking",
-                        "non-blocking-list": [
-                            {
-                                "nbl-number": 2,
-                                "lcp-list": [
-                                    "XPDR2-NETWORK1",
-                                    "XPDR2-CLIENT2"
-                                ],
-                                "interconnect-bandwidth": 0
-                            },
-                            {
-                                "nbl-number": 1,
-                                "lcp-list": [
-                                    "XPDR2-CLIENT1",
-                                    "XPDR2-NETWORK1"
-                                ],
-                                "interconnect-bandwidth": 0
-                            }
-                        ]
-                    }
-                ],
-                "mapping": [
-                    {
-                        "logical-connection-point": "XPDR2-CLIENT1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/2/1/1-PLUG-CLIENT",
-                        "mpdr-restrictions": {
-                            "min-trib-slot": "1.1",
-                            "max-trib-slot": "1.20"
-                        },
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-100GE-ODU4",
-                            "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-                        ],
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "lcp-hash-val": "AP2/mp+mI1y5",
-                        "supporting-port": "C1",
-                        "port-qual": "switch-client"
-                    },
-                    {
-                        "logical-connection-point": "XPDR1-NETWORK1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/1/2-PLUG-NET",
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-otsi-otsigroup"
-                        ],
-                        "port-oper-state": "InService",
-                        "connection-map-lcp": "XPDR1-CLIENT1",
-                        "port-direction": "bidirectional",
-                        "xponder-type": "tpdr",
-                        "lcp-hash-val": "ZbICgmaBrJM=",
-                        "supporting-port": "L1",
-                        "port-qual": "xpdr-network"
-                    },
-                    {
-                        "logical-connection-point": "XPDR2-CLIENT2",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/2/1/2-PLUG-CLIENT",
-                        "mpdr-restrictions": {
-                            "min-trib-slot": "2.1",
-                            "max-trib-slot": "2.20"
+            "switching-pool-lcp": [
+                {
+                    "switching-pool-number": 1,
+                    "switching-pool-type": "blocking",
+                    "non-blocking-list": [
+                        {
+                            "nbl-number": 2,
+                            "lcp-list": [
+                                "XPDR2-NETWORK1",
+                                "XPDR2-CLIENT2"
+                            ],
+                            "interconnect-bandwidth": 0
                          },
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-100GE-ODU4",
-                            "org-openroadm-port-types:if-OCH-OTU4-ODU4"
-                        ],
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "lcp-hash-val": "AP2/mp+mI1y6",
-                        "supporting-port": "C1",
-                        "port-qual": "switch-client"
-                    },
-                    {
-                        "logical-connection-point": "XPDR1-CLIENT1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/1/1-PLUG-CLIENT",
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-400GE"
-                        ],
-                        "port-oper-state": "InService",
-                        "connection-map-lcp": "XPDR1-NETWORK1",
-                        "port-direction": "bidirectional",
-                        "lcp-hash-val": "M5cViLS5z3o=",
-                        "supporting-port": "C1",
-                        "port-qual": "xpdr-client"
-                    },
-                    {
-                        "logical-connection-point": "XPDR2-NETWORK1",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/2/2-PLUG-NET",
-                        "supported-interface-capability": [
-                            "org-openroadm-port-types:if-otsi-otsigroup"
-                        ],
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "xponder-type": "mpdr",
-                        "lcp-hash-val": "Nmbu2MNHvc4=",
-                        "supporting-port": "L1",
-                        "port-qual": "switch-network"
-                    }
-                ],
-                "mc-capabilities": [
-                    {
-                        "mc-node-name": "XPDR-mcprofile",
-                        "center-freq-granularity": 3.125,
-                        "slot-width-granularity": 6.25
-                    }
-                ]
+                        {
+                            "nbl-number": 1,
+                            "lcp-list": [
+                                "XPDR2-CLIENT1",
+                                "XPDR2-NETWORK1"
+                            ],
+                            "interconnect-bandwidth": 0
+                        }
+                    ]
+                }
+            ],
+            "mapping": [
+                {
+                    "logical-connection-point": "XPDR2-CLIENT1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/2/1/1-PLUG-CLIENT",
+                    "mpdr-restrictions": {
+                        "min-trib-slot": "1.1",
+                        "max-trib-slot": "1.20"
+                    },
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-100GE-ODU4",
+                        "org-openroadm-port-types:if-OCH-OTU4-ODU4"
+                    ],
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "lcp-hash-val": "AP2/mp+mI1y5",
+                    "supporting-port": "C1",
+                    "port-qual": "switch-client"
+                },
+                {
+                    "logical-connection-point": "XPDR1-NETWORK1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/1/2-PLUG-NET",
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-otsi-otsigroup"
+                    ],
+                    "port-oper-state": "InService",
+                    "connection-map-lcp": "XPDR1-CLIENT1",
+                    "port-direction": "bidirectional",
+                    "xponder-type": "tpdr",
+                    "lcp-hash-val": "ZbICgmaBrJM=",
+                    "supporting-port": "L1",
+                    "port-qual": "xpdr-network"
+                },
+                {
+                    "logical-connection-point": "XPDR2-CLIENT2",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/2/1/2-PLUG-CLIENT",
+                    "mpdr-restrictions": {
+                        "min-trib-slot": "2.1",
+                        "max-trib-slot": "2.20"
+                    },
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-100GE-ODU4",
+                        "org-openroadm-port-types:if-OCH-OTU4-ODU4"
+                    ],
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "lcp-hash-val": "AP2/mp+mI1y6",
+                    "supporting-port": "C1",
+                    "port-qual": "switch-client"
+                },
+                {
+                    "logical-connection-point": "XPDR1-CLIENT1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/1/1-PLUG-CLIENT",
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-400GE"
+                    ],
+                    "port-oper-state": "InService",
+                    "connection-map-lcp": "XPDR1-NETWORK1",
+                    "port-direction": "bidirectional",
+                    "lcp-hash-val": "M5cViLS5z3o=",
+                    "supporting-port": "C1",
+                    "port-qual": "xpdr-client"
+                },
+                {
+                    "logical-connection-point": "XPDR2-NETWORK1",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/2/2-PLUG-NET",
+                    "supported-interface-capability": [
+                        "org-openroadm-port-types:if-otsi-otsigroup"
+                    ],
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "xponder-type": "mpdr",
+                    "lcp-hash-val": "Nmbu2MNHvc4=",
+                    "supporting-port": "L1",
+                    "port-qual": "switch-network"
+                }
+            ],
+            "mc-capabilities": [
+                {
+                    "mc-node-name": "XPDR-mcprofile",
+                    "center-freq-granularity": 3.125,
+                    "slot-width-granularity": 6.25
+                }
+            ]
+        },
+        {
+            "node-id": "ROADM-A1",
+            "node-info": {
+                "node-clli": "NodeA",
+                "node-vendor": "vendorA",
+                "openroadm-version": "2.2.1",
+                "node-ip-address": "127.0.0.11",
+                "node-type": "rdm",
+                "node-model": "model2"
              },
-            {
-                "node-id": "ROADM-A1",
-                "node-info": {
-                    "node-clli": "NodeA",
-                    "node-vendor": "vendorA",
-                    "openroadm-version": "2.2.1",
-                    "node-ip-address": "127.0.0.11",
-                    "node-type": "rdm",
-                    "node-model": "model2"
-                },
-                "cp-to-degree": [
-                    {
-                        "circuit-pack-name": "1/0/ETH-PLUG",
-                        "degree-number": 1,
-                        "interface-name": "1GE-interface-1"
-                    },
-                    {
-                        "circuit-pack-name": "2/0",
-                        "degree-number": 2,
-                        "interface-name": "1GE-interface-2"
-                    },
-                    {
-                        "circuit-pack-name": "2/0/ETH-PLUG",
-                        "degree-number": 2,
-                        "interface-name": "1GE-interface-2"
-                    },
-                    {
-                        "circuit-pack-name": "1/0",
-                        "degree-number": 1,
-                        "interface-name": "1GE-interface-1"
-                    }
-                ],
-                "mapping": [
-                    {
-                        "logical-connection-point": "SRG3-PP1-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "5/0",
-                        "supporting-port": "C1",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP2-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C2",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG3-PP4-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "5/0",
-                        "supporting-port": "C4",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP4-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C4",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG3-PP3-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "5/0",
-                        "supporting-port": "C3",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "DEG2-TTP-TXRX",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "2/0",
-                        "supporting-ots": "OTS-DEG2-TTP-TXRX",
-                        "port-oper-state": "InService",
-                        "port-direction": "bidirectional",
-                        "supporting-port": "L1",
-                        "supporting-oms": "OMS-DEG2-TTP-TXRX"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP3-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C3",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG3-PP2-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "5/0",
-                        "supporting-port": "C2",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "DEG1-TTP-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "1/0",
-                        "supporting-port": "L1",
-                        "port-oper-state": "InService"
-                    },
-                    {
-                        "logical-connection-point": "SRG1-PP1-TXRX",
-                        "port-direction": "bidirectional",
-                        "port-admin-state": "InService",
-                        "supporting-circuit-pack-name": "3/0",
-                        "supporting-port": "C1",
-                        "port-oper-state": "InService"
-                    }
-                ],
-                "mc-capabilities": [
-                    {
-                        "mc-node-name": "DEG2-TTP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    },
-                    {
-                        "mc-node-name": "DEG1-TTP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    },
-                    {
-                        "mc-node-name": "SRG3-PP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    },
-                    {
-                        "mc-node-name": "SRG1-PP",
-                        "center-freq-granularity": 50,
-                        "slot-width-granularity": 50
-                    }
-                ]
-            }
-        ]
-    }
+            "cp-to-degree": [
+                {
+                    "circuit-pack-name": "1/0/ETH-PLUG",
+                    "degree-number": 1,
+                    "interface-name": "1GE-interface-1"
+                },
+                {
+                    "circuit-pack-name": "2/0",
+                    "degree-number": 2,
+                    "interface-name": "1GE-interface-2"
+                },
+                {
+                    "circuit-pack-name": "2/0/ETH-PLUG",
+                    "degree-number": 2,
+                    "interface-name": "1GE-interface-2"
+                },
+                {
+                    "circuit-pack-name": "1/0",
+                    "degree-number": 1,
+                    "interface-name": "1GE-interface-1"
+                }
+            ],
+            "mapping": [
+                {
+                    "logical-connection-point": "SRG3-PP1-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "5/0",
+                    "supporting-port": "C1",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP2-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C2",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG3-PP4-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "5/0",
+                    "supporting-port": "C4",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP4-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C4",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG3-PP3-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "5/0",
+                    "supporting-port": "C3",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "DEG2-TTP-TXRX",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "2/0",
+                    "supporting-ots": "OTS-DEG2-TTP-TXRX",
+                    "port-oper-state": "InService",
+                    "port-direction": "bidirectional",
+                    "supporting-port": "L1",
+                    "supporting-oms": "OMS-DEG2-TTP-TXRX"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP3-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C3",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG3-PP2-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "5/0",
+                    "supporting-port": "C2",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "DEG1-TTP-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "1/0",
+                    "supporting-port": "L1",
+                    "port-oper-state": "InService"
+                },
+                {
+                    "logical-connection-point": "SRG1-PP1-TXRX",
+                    "port-direction": "bidirectional",
+                    "port-admin-state": "InService",
+                    "supporting-circuit-pack-name": "3/0",
+                    "supporting-port": "C1",
+                    "port-oper-state": "InService"
+                }
+            ],
+            "mc-capabilities": [
+                {
+                    "mc-node-name": "DEG2-TTP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                },
+                {
+                    "mc-node-name": "DEG1-TTP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                },
+                {
+                    "mc-node-name": "SRG3-PP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                },
+                {
+                    "mc-node-name": "SRG1-PP",
+                    "center-freq-granularity": 50,
+                    "slot-width-granularity": 50
+                }
+            ]
+        }
+    ]
  }
diff --git a/tests/transportpce_tests/1.2.1/test01_portmapping.py b/tests/transportpce_tests/1.2.1/test01_portmapping.py

index 1d7a5c24b915dc2257e277354e24a9cead492a9a..5553da737887c56646e555fa233a9f18b2d4b081 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test01_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test01_portmapping.py
@@ -56,7 +56,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          time.sleep(10)
  
      def test_03_rdm_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("ROADMA01")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADMA01", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'rdm',
@@ -69,7 +69,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          time.sleep(3)
  
      def test_04_rdm_portmapping_DEG1_TTP_TXRX(self):
-        response = test_utils_rfc8040.portmapping_request("ROADMA01", "DEG1-TTP-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADMA01", "mapping", "DEG1-TTP-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
@@ -78,7 +78,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_05_rdm_portmapping_SRG1_PP7_TXRX(self):
-        response = test_utils_rfc8040.portmapping_request("ROADMA01", "SRG1-PP7-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADMA01", "mapping", "SRG1-PP7-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C7', 'supporting-circuit-pack-name': '4/0',
@@ -87,7 +87,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_06_rdm_portmapping_SRG3_PP1_TXRX(self):
-        response = test_utils_rfc8040.portmapping_request("ROADMA01", "SRG3-PP1-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADMA01", "mapping", "SRG3-PP1-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C1', 'supporting-circuit-pack-name': '5/0',
@@ -106,7 +106,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          time.sleep(10)
  
      def test_09_xpdr_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDRA01")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'xpdr',
@@ -119,7 +119,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          time.sleep(3)
  
      def test_10_xpdr_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
@@ -130,7 +130,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_11_xpdr_portmapping_NETWORK2(self):
-        response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-NETWORK2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "mapping", "XPDR1-NETWORK2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/2-PLUG-NET',
@@ -141,7 +141,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_12_xpdr_portmapping_CLIENT1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-CLIENT1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "mapping", "XPDR1-CLIENT1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C1',
@@ -153,7 +153,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_13_xpdr_portmapping_CLIENT2(self):
-        response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-CLIENT2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "mapping", "XPDR1-CLIENT2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C2',
@@ -165,7 +165,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_14_xpdr_portmapping_CLIENT3(self):
-        response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-CLIENT3")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "mapping", "XPDR1-CLIENT3")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C3', 'xponder-type': 'tpdr',
@@ -177,7 +177,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_15_xpdr_portmapping_CLIENT4(self):
-        response = test_utils_rfc8040.portmapping_request("XPDRA01", "XPDR1-CLIENT4")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "mapping", "XPDR1-CLIENT4")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C4', 'xponder-type': 'tpdr',
@@ -200,7 +200,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                           'Request could not be completed because the relevant data model content does not exist')
  
      def test_18_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDRA01")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.conflict)
          self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
          self.assertEqual(response['node-info']['error-tag'], 'data-missing')
@@ -220,7 +220,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                           'Request could not be completed because the relevant data model content does not exist')
  
      def test_21_rdm_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("ROADMA01")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADMA01", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.conflict)
          self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
          self.assertEqual(response['node-info']['error-tag'], 'data-missing')
diff --git a/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py b/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py

index 653ae84555ea42df5b59d77c6e953a74b3278a5c..03a02307a68efa97fa2779e45086e51cc2c198df 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
+++ b/tests/transportpce_tests/1.2.1/test02_topo_portmapping.py
@@ -12,7 +12,6 @@
  # pylint: disable=no-member
  # pylint: disable=too-many-public-methods
  # a pylint false positive due to unittest
-# pylint: disable=no-self-use
  
  import time
  import unittest
@@ -57,12 +56,12 @@ class TransportPCEtesting(unittest.TestCase):
          for node in resTopo['network'][0]['node']:
              nodeId = node['node-id']
              nodeMapId = nodeId.split("-")[0]
-            response = test_utils_rfc8040.get_portmapping_node_info(nodeMapId)
+            response = test_utils_rfc8040.get_portmapping_node_attr(nodeMapId, "node-info", None)
              self.assertEqual(response['status_code'], requests.codes.ok)
              for tp in node['ietf-network-topology:termination-point']:
                  tpId = tp['tp-id']
                  if (not "CP" in tpId) and (not "CTP" in tpId):
-                    response2 = test_utils_rfc8040.portmapping_request(nodeMapId, tpId)
+                    response2 = test_utils_rfc8040.get_portmapping_node_attr(nodeMapId, "mapping", tpId)
                      self.assertEqual(response2['status_code'], requests.codes.ok)
  
      # Disconnect the ROADMA
diff --git a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py

index 40f6bb96116b7f9afa07c8b2aa2e55c886e6010c..bde6c27d6d503e694bfcde349f2c3355283b8637 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py
@@ -54,7 +54,7 @@ class TransportPCERendererTesting(unittest.TestCase):
          self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_rdm_portmapping(self):
-        response = test_utils_rfc8040.get_portmapping("ROADMA01")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADMA01", None, None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
@@ -68,7 +68,7 @@ class TransportPCERendererTesting(unittest.TestCase):
              response['nodes'][0]['mapping'])
  
      def test_04_xpdr_portmapping(self):
-        response = test_utils_rfc8040.get_portmapping("XPDRA01")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", None, None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': '1', 'supporting-circuit-pack-name': '1/0/1-PLUG-NET',
@@ -164,16 +164,11 @@ class TransportPCERendererTesting(unittest.TestCase):
                  'type': 'org-openroadm-interfaces:opticalChannel',
                  'supporting-port': '1'
              }, **response['interface'][0]), response['interface'][0])
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'rate': 'org-openroadm-optical-channel-interfaces:R100G',
-              'transmit-power': '-5',
-              'wavelength-number': 7,
-              'modulation-format': 'dp-qpsk'},
-             {'rate': 'org-openroadm-optical-channel-interfaces:R100G',
-              'transmit-power': -5,
-              'wavelength-number': 7,
-              'modulation-format': 'dp-qpsk'}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-optical-channel-interfaces:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(intf['wavelength-number'], 7)
+        self.assertEqual(float(intf['transmit-power']), -5)
  
      def test_10_service_path_create_xpdr_check(self):
          response = test_utils_rfc8040.check_node_attribute_request("XPDRA01", "interface", "XPDR1-NETWORK1-OTU")
diff --git a/tests/transportpce_tests/1.2.1/test06_end2end.py b/tests/transportpce_tests/1.2.1/test06_end2end.py

index 4397151129ef5f6dcd318c12f41aeab832f4dfdd..058f6d3be3f51a953d28c65cd29368ad8dd0388c 100644 (file)
--- a/tests/transportpce_tests/1.2.1/test06_end2end.py
+++ b/tests/transportpce_tests/1.2.1/test06_end2end.py
@@ -20,11 +20,11 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEFulltesting(unittest.TestCase):
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
          "sdnc-request-header": {
              "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
              "rpc-action": "service-create",
@@ -56,6 +56,15 @@ class TransportPCEFulltesting(unittest.TestCase):
          "due-date": "2016-11-28T00:00:01Z",
          "operator-contact": "pw1234"
      }
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
      processes = None
      WAITING = 20
@@ -63,74 +72,74 @@ class TransportPCEFulltesting(unittest.TestCase):
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION),
-                                               ('roadma-full', cls.NODE_VERSION),
-                                               ('roadmc-full', cls.NODE_VERSION),
-                                               ('xpdrc', cls.NODE_VERSION)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION),
+                                                       ('roadma-full', cls.NODE_VERSION),
+                                                       ('roadmc-full', cls.NODE_VERSION),
+                                                       ('xpdrc', cls.NODE_VERSION)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):  # instruction executed before each test method
          # pylint: disable=consider-using-f-string
          print("execution of {}".format(self.id().split(".")[-1]))
  
-    #  connect netconf devices
+     # connect netconf devices
      def test_01_connect_xpdrA(self):
-        response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_02_connect_xpdrC(self):
-        response = test_utils.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDRC01", ('xpdrc', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_connect_rdmA(self):
-        response = test_utils.mount_device("ROADMA01", ('roadma-full', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADMA01", ('roadma-full', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_04_connect_rdmC(self):
-        response = test_utils.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADMC01", ('roadmc-full', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_05_connect_xprdA_N1_to_roadmA_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1",
-                                                          "ROADMA01", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1",
-                                                          "ROADMA01", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDRC01", "1", "1",
-                                                          "ROADMC01", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDRC01", "1", "1",
-                                                          "ROADMC01", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_09_add_omsAttributes_ROADMA_ROADMC(self):
@@ -145,7 +154,8 @@ class TransportPCEFulltesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_10_add_omsAttributes_ROADMC_ROADMA(self):
@@ -160,106 +170,87 @@ class TransportPCEFulltesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      # test service-create for Eth service from xpdr to xpdr
+
      def test_11_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_12_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_13_check_xc1_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADMA01", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-number': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768',
                  'wavelength-number': 1,
-                'opticalControlMode': 'gainLoss',
-                'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG1-TTP-TXRX-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(5)
+                'opticalControlMode': 'gainLoss'
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_14_check_xc1_ROADMC(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADMC01", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-number': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
                  'wavelength-number': 1,
-                'opticalControlMode': 'gainLoss',
-                'target-output-power': 2.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG2-TTP-TXRX-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(5)
+                'opticalControlMode': 'gainLoss'
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_15_check_topo_XPDRA(self):
-        response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDRA01-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({'frequency': 196.1,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.1,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40.0,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
              elif ele['tp-id'] in ('XPDR1-CLIENT2', 'XPDR1-CLIENT1'):
                  self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
              elif ele['tp-id'] == 'XPDR1-NETWORK2':
                  self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_16_check_topo_ROADMA_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -268,17 +259,16 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
              elif ele['tp-id'] == 'SRG1-PP2-TXRX':
                  self.assertNotIn('avail-freq-maps', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_17_check_topo_ROADMA_DEG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-DEG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -290,118 +280,110 @@ class TransportPCEFulltesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_18_connect_xprdA_N2_to_roadmA_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "2",
-                                                          "ROADMA01", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_19_connect_roadmA_PP2_to_xpdrA_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "2",
-                                                          "ROADMA01", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADMA01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_20_connect_xprdC_N2_to_roadmC_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDRC01", "1", "2",
-                                                          "ROADMC01", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_21_connect_roadmC_PP2_to_xpdrC_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDRC01", "1", "2",
-                                                          "ROADMC01", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDRC01', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADMC01', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_22_create_eth_service2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_23_get_eth_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service2')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
          time.sleep(1)
  
      def test_24_check_xc2_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADMA01", "roadm-connections/DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADMA01", "roadm-connections", "DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-number': 'DEG1-TTP-TXRX-SRG1-PP2-TXRX-753:760',
                  'wavelength-number': 2,
                  'opticalControlMode': 'power'
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'DEG1-TTP-TXRX-753:760'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'SRG1-PP2-TXRX-753:760'},
-            res['roadm-connections'][0]['destination'])
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'DEG1-TTP-TXRX-753:760'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'SRG1-PP2-TXRX-753:760'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_25_check_topo_XPDRA(self):
-        response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDRA01-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({'frequency': 196.1,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.1,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40.0,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
              elif ele['tp-id'] == 'XPDR1-NETWORK2':
-                self.assertEqual({'frequency': 196.05,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.05,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40.0,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
              elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'):
                  self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_26_check_topo_ROADMA_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -417,18 +399,17 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
              elif ele['tp-id'] == 'SRG1-PP3-TXRX':
                  self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_27_check_topo_ROADMA_DEG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-DEG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -442,66 +423,65 @@ class TransportPCEFulltesting(unittest.TestCase):
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
                  self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        time.sleep(10)
+        time.sleep(1)
  
      #     creation service test on a non-available resource
      def test_28_create_eth_service3(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service3"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service3"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
-        self.assertIn('200', res['output']['configuration-response-common'][
-            'response-code'])
+                      response['output']['configuration-response-common']['response-message'])
+        self.assertIn('200', response['output']['configuration-response-common']['response-code'])
          time.sleep(self.WAITING)
  
      # add a test that check the openroadm-service-list still only
      # contains 2 elements
  
      def test_29_delete_eth_service3(self):
-        response = test_utils.service_delete_request("service3")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service3"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Service \'service3\' does not exist in datastore',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
-        self.assertIn('500', res['output']['configuration-response-common'][
-            'response-code'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        self.assertIn('500', response['output']['configuration-response-common']['response-code'])
+        time.sleep(3)
  
      def test_30_delete_eth_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_31_delete_eth_service2(self):
-        response = test_utils.service_delete_request("service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_32_check_no_xc_ROADMA(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "")
-        res = response.json()
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils_rfc8040.check_node_request("ROADMA01")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertNotIn('roadm-connections',
-                         dict.keys(res['org-openroadm-device']))
+                         dict.keys(response['org-openroadm-device']))
          time.sleep(2)
  
      def test_33_check_topo_XPDRA(self):
-        response = test_utils.get_ordm_topo_request("node/XPDRA01-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDRA01-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if (ele['org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT'
                      and ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT3')):
@@ -515,18 +495,17 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertNotIn('wavelength', dict.keys(
                      ele['org-openroadm-network-topology:'
                          'xpdr-network-attributes']))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_34_check_topo_ROADMA_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Lambda 1 should  be available")
          self.assertEqual(freq_map_array[94], 255, "Lambda 2 should  be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX' or ele['tp-id'] == 'SRG1-PP2-TXRX':
                  freq_map = base64.b64decode(
@@ -542,18 +521,17 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[94], 255, "Lambda 2 should  be available")
              else:
                  self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_35_check_topo_ROADMA_DEG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-DEG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-DEG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
          self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -567,44 +545,38 @@ class TransportPCEFulltesting(unittest.TestCase):
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
                  self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-        time.sleep(10)
+        time.sleep(1)
  
      # test service-create for Optical Channel (OC) service from srg-pp to srg-pp
+
      def test_36_create_oc_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1"
+        self.cr_serv_input_data["connection-type"] = "roadm-line"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "ROADMA01"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "OC"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "ROADMC01"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "OC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_37_get_oc_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'roadm-line')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['connection-type'], 'roadm-line')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
          time.sleep(1)
  
      def test_38_check_xc1_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADMA01", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADMA01", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
@@ -612,22 +584,15 @@ class TransportPCEFulltesting(unittest.TestCase):
                  'wavelength-number': 1,
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG1-TTP-TXRX-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(7)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_39_check_xc1_ROADMC(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADMC01", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADMC01", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
@@ -635,52 +600,39 @@ class TransportPCEFulltesting(unittest.TestCase):
                  'wavelength-number': 1,
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': 2.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG2-TTP-TXRX-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(7)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_40_create_oc_service2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
-        self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADMA01"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADMC01"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service2"
+        self.cr_serv_input_data["connection-type"] = "roadm-line"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "ROADMA01"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "OC"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "ROADMC01"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "OC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_41_get_oc_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'roadm-line')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service2')
+        self.assertEqual(response['services'][0]['connection-type'], 'roadm-line')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
          time.sleep(2)
  
      def test_42_check_xc2_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADMA01", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADMA01", "roadm-connections", "SRG1-PP2-TXRX-DEG1-TTP-TXRX-753:760")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
@@ -688,61 +640,59 @@ class TransportPCEFulltesting(unittest.TestCase):
                  'wavelength-number': 2,
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP2-TXRX-753:760'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG1-TTP-TXRX-753:760'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(2)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP2-TXRX-753:760'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-753:760'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_43_check_topo_ROADMA(self):
          self.test_26_check_topo_ROADMA_SRG1()
          self.test_27_check_topo_ROADMA_DEG1()
-        time.sleep(3)
+        time.sleep(1)
  
      def test_44_delete_oc_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_45_delete_oc_service2(self):
-        response = test_utils.service_delete_request("service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common'][
-                          'response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_46_get_no_oc_services(self):
-        print("start test")
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['service-list'], (
              {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
                  "error-type": "application",
                  "error-tag": "data-missing",
                  "error-message":
                      "Request could not be completed because the relevant data "
                      "model content does not exist"
-            },
-            res['errors']['error'])
+            }))
          time.sleep(1)
  
      def test_47_get_no_xc_ROADMA(self):
-        response = test_utils.check_netconf_node_request("ROADMA01", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device'])
+        response = test_utils_rfc8040.check_node_request("ROADMA01")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn('roadm-connections', dict.keys(response['org-openroadm-device']))
          time.sleep(1)
  
      def test_48_check_topo_ROADMA(self):
@@ -751,7 +701,7 @@ class TransportPCEFulltesting(unittest.TestCase):
  
      def test_49_loop_create_eth_service(self):
          # pylint: disable=consider-using-f-string
-        for i in range(1, 6):
+        for i in range(1, 4):
              print("iteration number {}".format(i))
              print("eth service creation")
              self.test_11_create_eth_service1()
@@ -763,13 +713,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              self.test_30_delete_eth_service1()
  
      def test_50_loop_create_oc_service(self):
-        response = test_utils.get_service_list_request("services/service1")
-        if response.status_code != 404:
-            response = test_utils.service_delete_request("service1")
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        if response['status_code'] != 404:
+            self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+            response = test_utils_rfc8040.transportpce_api_rpc_request(
+                'org-openroadm-service', 'service-delete',
+                self.del_serv_input_data)
              time.sleep(5)
  
          # pylint: disable=consider-using-f-string
-        for i in range(1, 6):
+        for i in range(1, 4):
              print("iteration number {}".format(i))
              print("oc service creation")
              self.test_36_create_oc_service1()
@@ -781,20 +734,20 @@ class TransportPCEFulltesting(unittest.TestCase):
              self.test_44_delete_oc_service1()
  
      def test_51_disconnect_XPDRA(self):
-        response = test_utils.unmount_device("XPDRA01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDRA01")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_52_disconnect_XPDRC(self):
-        response = test_utils.unmount_device("XPDRC01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDRC01")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_53_disconnect_ROADMA(self):
-        response = test_utils.unmount_device("ROADMA01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADMA01")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_54_disconnect_ROADMC(self):
-        response = test_utils.unmount_device("ROADMC01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADMC01")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/2.2.1/test01_portmapping.py b/tests/transportpce_tests/2.2.1/test01_portmapping.py

index a77584ddd0bbb59213f33a45216f5eb8b22a67b5..645db1c4136c0c4691e5df20e9efee18d4b25a7a 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test01_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test01_portmapping.py
@@ -56,7 +56,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['connection-status'], 'connected')
  
      def test_03_rdm_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("ROADM-A1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'rdm',
@@ -68,7 +68,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['node-info'])
  
      def test_04_rdm_portmapping_DEG1_TTP_TXRX(self):
-        response = test_utils_rfc8040.portmapping_request("ROADM-A1", "DEG1-TTP-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", "mapping", "DEG1-TTP-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
@@ -77,7 +77,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_05_rdm_portmapping_DEG2_TTP_TXRX_with_ots_oms(self):
-        response = test_utils_rfc8040.portmapping_request("ROADM-A1", "DEG2-TTP-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", "mapping", "DEG2-TTP-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '2/0',
@@ -88,7 +88,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_06_rdm_portmapping_SRG1_PP3_TXRX(self):
-        response = test_utils_rfc8040.portmapping_request("ROADM-A1", "SRG1-PP3-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", "mapping", "SRG1-PP3-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C3', 'supporting-circuit-pack-name': '3/0',
@@ -97,7 +97,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_07_rdm_portmapping_SRG3_PP1_TXRX(self):
-        response = test_utils_rfc8040.portmapping_request("ROADM-A1", "SRG3-PP1-TXRX")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", "mapping", "SRG3-PP1-TXRX")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'C1', 'supporting-circuit-pack-name': '5/0',
@@ -115,7 +115,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['connection-status'], 'connected')
  
      def test_10_xpdr_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'xpdr',
@@ -127,7 +127,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['node-info'])
  
      def test_11_xpdr_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability': ['org-openroadm-port-types:if-OCH'],
@@ -139,7 +139,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_12_xpdr_portmapping_XPDR2_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-NETWORK2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", "mapping", "XPDR1-NETWORK2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability': ['org-openroadm-port-types:if-OCH'],
@@ -151,7 +151,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_13_xpdr_portmapping_XPDR1_CLIENT1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-CLIENT1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", "mapping", "XPDR1-CLIENT1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability': ['org-openroadm-port-types:if-100GE'],
@@ -164,7 +164,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_14_xpdr_portmapping_XPDR1_CLIENT2(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A1", "XPDR1-CLIENT2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", "mapping", "XPDR1-CLIENT2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability': ['org-openroadm-port-types:if-100GE'],
@@ -186,7 +186,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['connection-status'], 'connected')
  
      def test_17_spdr_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("SPDR-SA1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'xpdr',
@@ -198,26 +198,26 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['node-info'])
  
      def test_18_spdr_switching_pool_1(self):
-        response = test_utils_rfc8040.portmapping_switching_pool_request("SPDR-SA1", "1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "switching-pool-lcp", "1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual("blocking",
-                         response['switching_pool'][0]['switching-pool-type'])
+                         response['switching-pool-lcp'][0]['switching-pool-type'])
          self.assertEqual(4,
-                         len(response['switching_pool'][0]['non-blocking-list']))
+                         len(response['switching-pool-lcp'][0]['non-blocking-list']))
          self.assertIn(
              {'nbl-number': 11,
               'lcp-list': ['XPDR1-CLIENT1', 'XPDR1-NETWORK1'],
               'interconnect-bandwidth-unit': 1000000000,
               'interconnect-bandwidth': 0},
-            response['switching_pool'][0]['non-blocking-list'])
+            response['switching-pool-lcp'][0]['non-blocking-list'])
  
      def test_19_spdr_switching_pool_2(self):
-        response = test_utils_rfc8040.portmapping_switching_pool_request("SPDR-SA1", "2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "switching-pool-lcp", "2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual("non-blocking",
-                         response['switching_pool'][0]['switching-pool-type'])
+                         response['switching-pool-lcp'][0]['switching-pool-type'])
          self.assertEqual(1,
-                         len(response['switching_pool'][0]['non-blocking-list']))
+                         len(response['switching-pool-lcp'][0]['non-blocking-list']))
          self.assertIn(
              {'nbl-number': 2,
               'lcp-list': ['XPDR2-NETWORK2', 'XPDR2-NETWORK3', 'XPDR2-CLIENT1',
@@ -225,29 +225,29 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                            'XPDR2-CLIENT4', 'XPDR2-NETWORK4'],
               'interconnect-bandwidth-unit': 1000000000,
               'interconnect-bandwidth': 0},
-            response['switching_pool'][0]['non-blocking-list'])
+            response['switching-pool-lcp'][0]['non-blocking-list'])
  
      def test_20_spdr_switching_pool_3(self):
-        response = test_utils_rfc8040.portmapping_switching_pool_request("SPDR-SA1", "3")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "switching-pool-lcp", "3")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual("blocking",
-                         response['switching_pool'][0]['switching-pool-type'])
+                         response['switching-pool-lcp'][0]['switching-pool-type'])
          self.assertEqual(4,
-                         len(response['switching_pool'][0]['non-blocking-list']))
+                         len(response['switching-pool-lcp'][0]['non-blocking-list']))
          self.assertIn(
              {'nbl-number': 83,
               'interconnect-bandwidth': 0,
               'interconnect-bandwidth-unit': 1000000000,
               'lcp-list': ['XPDR3-NETWORK1', 'XPDR3-CLIENT3']},
-            response['switching_pool'][0]['non-blocking-list'])
+            response['switching-pool-lcp'][0]['non-blocking-list'])
  
      def test_21_spdr_portmapping_mappings(self):
-        response = test_utils_rfc8040.get_portmapping("SPDR-SA1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", None, None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(18, len(response['nodes'][0]['mapping']))
  
      def test_22_spdr_portmapping_XPDR1_CLIENT1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-CLIENT1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-CLIENT1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          expected_subset_response = {
              "logical-connection-point": "XPDR1-CLIENT1",
@@ -266,7 +266,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          self.assertEqual(sorted(response['mapping'][0]['supported-interface-capability']), expected_sorted_list)
  
      def test_23_spdr_portmapping_XPDR1_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {"logical-connection-point": "XPDR1-NETWORK1",
@@ -282,7 +282,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_24_spdr_portmapping_XPDR2_CLIENT2(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR2-CLIENT2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR2-CLIENT2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          expected_subset_response = {
              'logical-connection-point': 'XPDR2-CLIENT2',
@@ -301,7 +301,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          self.assertEqual(sorted(response['mapping'][0]['supported-interface-capability']), expected_sorted_list)
  
      def test_25_spdr_portmapping_XPDR2_NETWORK2(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR2-NETWORK2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR2-NETWORK2")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {"logical-connection-point": "XPDR2-NETWORK2",
@@ -317,7 +317,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_26_spdr_portmapping_XPDR3_CLIENT3(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR3-CLIENT3")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR3-CLIENT3")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {"logical-connection-point": "XPDR3-CLIENT3",
@@ -333,7 +333,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_27_spdr_portmapping_XPDR3_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR3-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR3-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {"logical-connection-point": "XPDR3-NETWORK1",
@@ -373,7 +373,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                           'Request could not be completed because the relevant data model content does not exist')
  
      def test_32_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.conflict)
          self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
          self.assertEqual(response['node-info']['error-tag'], 'data-missing')
@@ -393,7 +393,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                           'Request could not be completed because the relevant data model content does not exist')
  
      def test_35_rdm_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("ROADM-A1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.conflict)
          self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
          self.assertEqual(response['node-info']['error-tag'], 'data-missing')
diff --git a/tests/transportpce_tests/2.2.1/test02_topo_portmapping.py b/tests/transportpce_tests/2.2.1/test02_topo_portmapping.py

index 586b882f1868933b174bae4144b0974485f0f862..ec168858012a23e844046e1c6a0878898f4a1af2 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test02_topo_portmapping.py
+++ b/tests/transportpce_tests/2.2.1/test02_topo_portmapping.py
@@ -60,15 +60,15 @@ class TransportPCEtesting(unittest.TestCase):
              print("nodeId={}".format(nodeId))
              nodeMapId = nodeId.split("-")[0] + "-" + nodeId.split("-")[1]
              print("nodeMapId={}".format(nodeMapId))
-            response = test_utils_rfc8040.get_portmapping_node_info(nodeMapId)
+            response = test_utils_rfc8040.get_portmapping_node_attr(nodeMapId, "node-info", None)
              self.assertEqual(response['status_code'], requests.codes.ok)
-            responseMapList = test_utils_rfc8040.get_portmapping(nodeMapId)
+            responseMapList = test_utils_rfc8040.get_portmapping_node_attr(nodeMapId, None, None)
              nbMappings = len(responseMapList['nodes'][0]['mapping']) - nbMapCumul
              nbMapCurrent = 0
              for tp in node['ietf-network-topology:termination-point']:
                  tpId = tp['tp-id']
                  if (not "CP" in tpId) and (not "CTP" in tpId):
-                    responseMap = test_utils_rfc8040.portmapping_request(nodeMapId, tpId)
+                    responseMap = test_utils_rfc8040.get_portmapping_node_attr(nodeMapId, "mapping", tpId)
                      self.assertEqual(responseMap['status_code'], requests.codes.ok)
                      if responseMap['status_code'] == requests.codes.ok:
                          nbMapCurrent += 1
diff --git a/tests/transportpce_tests/2.2.1/test05_flex_grid.py b/tests/transportpce_tests/2.2.1/test05_flex_grid.py

index 2d5674bc5b8119632abe81e3a8fd95a585b91402..96940bd47a2bbc5f3398c634728a3519b715770c 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test05_flex_grid.py
+++ b/tests/transportpce_tests/2.2.1/test05_flex_grid.py
@@ -55,7 +55,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
          time.sleep(10)
  
      def test_03_rdm_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("ROADM-D1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'rdm',
@@ -69,7 +69,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
  
      def test_04_rdm_deg1_lcp(self):
          # pylint: disable=line-too-long
-        response = test_utils_rfc8040.portmapping_mc_capa_request("ROADM-D1", "DEG1-TTP")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "mc-capabilities", "DEG1-TTP")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(response['mc-capabilities'],
                        [[{'mc-node-name': 'DEG1-TTP', 'center-freq-granularity': '6.25', 'slot-width-granularity': '12.5'}],
@@ -78,7 +78,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
  
      def test_05_rdm_deg2_lcp(self):
          # pylint: disable=line-too-long
-        response = test_utils_rfc8040.portmapping_mc_capa_request("ROADM-D1", "DEG2-TTP")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "mc-capabilities", "DEG2-TTP")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(response['mc-capabilities'],
                        [[{'mc-node-name': 'DEG2-TTP', 'center-freq-granularity': '6.25', 'slot-width-granularity': '12.5'}],
@@ -87,7 +87,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
  
      def test_06_rdm_srg1_lcp(self):
          # pylint: disable=line-too-long
-        response = test_utils_rfc8040.portmapping_mc_capa_request("ROADM-D1", "SRG1-PP")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-D1", "mc-capabilities", "SRG1-PP")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(response['mc-capabilities'],
                        [[{'mc-node-name': 'SRG1-PP', 'center-freq-granularity': '6.25', 'slot-width-granularity': '12.5'}],
@@ -134,11 +134,10 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                    "supporting-port": "L1",
                    "type": "org-openroadm-interfaces:mediaChannelTrailTerminationPoint"},
                   **response['interface'][0]), response['interface'][0])
-
          # Check the mc-ttp max and min-freq
-        self.assertIn(response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'],
-                      [{'min-freq': '196.00625', 'max-freq': '196.09375'},
-                       {'min-freq': 196.00625, 'max-freq': 196.09375}])
+        mcttp = response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']
+        self.assertEqual(float(mcttp['min-freq']), 196.00625)
+        self.assertEqual(float(mcttp['max-freq']), 196.09375)
          time.sleep(3)
  
      # get DEG-NMC interface and check
@@ -154,11 +153,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                    "supporting-port": "L1",
                    "type": "org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint"},
                   **response['interface'][0]), response['interface'][0])
-
-        # Check the mc-ttp max and min-freq
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '196.05000', 'width': '80'},
-                       {'frequency': 196.05, 'width': 80}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 196.05)
+        self.assertEqual(float(nmcctp['width']), 80)
          time.sleep(3)
  
      # get SRG-NMC interface
@@ -173,9 +170,9 @@ class TransportPCEPortMappingTesting(unittest.TestCase):
                    "supporting-port": "C1",
                    "type": "org-openroadm-interfaces:networkMediaChannelConnectionTerminationPoint"},
                   **response['interface'][0]), response['interface'][0])
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '196.05000', 'width': '80'},
-                       {'frequency': 196.05, 'width': 80}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 196.05)
+        self.assertEqual(float(nmcctp['width']), 80)
          time.sleep(3)
  
      # Create ROADM-connection
diff --git a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py

index dc7680acd3cada617b2268e038a61ed313765515..6e37b24a6bca9b6f89c172b44a4d9e029bad259a 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
+++ b/tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py
@@ -49,7 +49,7 @@ class TransportPCERendererTesting(unittest.TestCase):
          self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_rdm_portmapping(self):
-        response = test_utils_rfc8040.get_portmapping("ROADM-A1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supporting-port': 'L1', 'supporting-circuit-pack-name': '1/0',
@@ -63,7 +63,7 @@ class TransportPCERendererTesting(unittest.TestCase):
              response['nodes'][0]['mapping'])
  
      def test_04_xpdr_portmapping(self):
-        response = test_utils_rfc8040.get_portmapping("XPDR-A1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A1", None, None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability': ['org-openroadm-port-types:if-OCH'],
@@ -116,9 +116,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                   'supporting-port': 'L1'
                   }, **response['interface'][0]), response['interface'][0]
          )
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '195.8000', 'width': '40'},
-                       {'frequency': 195.8, 'width': 40}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 195.8)
+        self.assertEqual(float(nmcctp['width']), 40)
  
      def test_07_service_path_create_rdm_check(self):
          response = test_utils_rfc8040.check_node_attribute_request("ROADM-A1", "interface", "DEG1-TTP-TXRX-mc-713:720")
@@ -133,9 +133,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                   'supporting-port': 'L1'
                   }, **response['interface'][0]), response['interface'][0]
          )
-        self.assertIn(response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp'],
-                      [{'min-freq': '195.7750', 'max-freq': '195.8250'},
-                       {'min-freq': 195.775, 'max-freq': 195.825}])
+        mcttp = response['interface'][0]['org-openroadm-media-channel-interfaces:mc-ttp']
+        self.assertEqual(float(mcttp['min-freq']), 195.775)
+        self.assertEqual(float(mcttp['max-freq']), 195.825)
  
      def test_08_service_path_create_rdm_check(self):
          response = test_utils_rfc8040.check_node_attribute_request("ROADM-A1", "interface", "SRG1-PP3-TXRX-nmc-713:720")
@@ -150,9 +150,9 @@ class TransportPCERendererTesting(unittest.TestCase):
                   'supporting-port': 'C3'
                   }, **response['interface'][0]), response['interface'][0]
          )
-        self.assertIn(response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp'],
-                      [{'frequency': '195.8000', 'width': '40'},
-                       {'frequency': 195.8, 'width': 40}])
+        nmcctp = response['interface'][0]['org-openroadm-network-media-channel-interfaces:nmc-ctp']
+        self.assertEqual(float(nmcctp['frequency']), 195.8)
+        self.assertEqual(float(nmcctp['width']), 40)
  
      # -mc supporting interfaces must not be created for SRG, only degrees
      def test_09_service_path_create_rdm_check(self):
@@ -185,12 +185,11 @@ class TransportPCERendererTesting(unittest.TestCase):
                   'supporting-port': '1'
                   }, **response['interface'][0]), response['interface'][0]
          )
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'rate': 'org-openroadm-common-types:R100G', 'transmit-power': '-5',
-              'modulation-format': 'dp-qpsk', 'frequency': '195.8000'},
-             {'rate': 'org-openroadm-common-types:R100G', 'transmit-power': -5,
-              'modulation-format': 'dp-qpsk', 'frequency': 195.8}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-common-types:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(float(intf['frequency']), 195.8)
+        self.assertEqual(float(intf['transmit-power']), -5)
  
      def test_12_service_path_create_xpdr_check(self):
          response = test_utils_rfc8040.check_node_attribute_request("XPDR-A1", "interface", "XPDR1-NETWORK1-OTU")
diff --git a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py

index 096fddb8e78de0209f5570d650d354ceab25ce66..c05e05265ec63183a04c3f83ad5abf8b9ba4655a 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test07_otn_renderer.py
@@ -65,7 +65,7 @@ class TransportPCEtesting(unittest.TestCase):
          self.assertEqual(response['connection-status'], 'connected')
  
      def test_02_get_portmapping_CLIENT4(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-CLIENT4")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-CLIENT4")
          self.assertEqual(response['status_code'], requests.codes.ok)
          res_mapping = response['mapping'][0]
          self.assertEqual('CP1-SFP4-P1', res_mapping['supporting-port'])
@@ -81,7 +81,7 @@ class TransportPCEtesting(unittest.TestCase):
          self.assertIn('org-openroadm-port-types:if-10GE', res_mapping['supported-interface-capability'])
  
      def test_03_get_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              self.NETWORK1_CHECK_DICT,
@@ -112,7 +112,7 @@ class TransportPCEtesting(unittest.TestCase):
               'och-interface-id': ['XPDR1-NETWORK1-761:768']}, response['output']['node-interface'])
  
      def test_05_get_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU"
          self.assertIn(
@@ -130,13 +130,11 @@ class TransportPCEtesting(unittest.TestCase):
                                                                 'supporting-port': 'CP1-CFP0-P1'
                                                                 }),
                               response['interface'][0])
-
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'frequency': '196.1000', 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': '-5', 'modulation-format': 'dp-qpsk'},
-             {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': -5, 'modulation-format': 'dp-qpsk'}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-common-types:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(float(intf['frequency']), 196.1)
+        self.assertEqual(float(intf['transmit-power']), -5)
  
      def test_07_check_interface_OTU(self):
          response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
@@ -177,7 +175,7 @@ class TransportPCEtesting(unittest.TestCase):
               'odu-interface-id': ['XPDR1-NETWORK1-ODU4']}, response['output']['node-interface'])
  
      def test_09_get_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("SPDR-SA1", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("SPDR-SA1", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK1_CHECK_DICT["supporting-odu4"] = "XPDR1-NETWORK1-ODU4"
          self.NETWORK1_CHECK_DICT["supporting-otu4"] = "XPDR1-NETWORK1-OTU"
diff --git a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py

index ecb7a9d3b784f1c4817a70daafc56ab845984899..d38e228eb9f44f7026fb88643da912854b41ae15 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
+++ b/tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py
@@ -178,12 +178,11 @@ class TransportPCEtesting(unittest.TestCase):
                                     'supporting-port': 'CP1-CFP0-P1'
                                     }, **response['interface'][0]),
                               response['interface'][0])
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'frequency': '196.1000', 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': '-5', 'modulation-format': 'dp-qpsk'},
-             {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': -5, 'modulation-format': 'dp-qpsk'}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-common-types:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(float(intf['frequency']), 196.1)
+        self.assertEqual(float(intf['transmit-power']), -5)
  
      def test_05_check_interface_OTU(self):
          response = test_utils_rfc8040.check_node_attribute_request("SPDR-SA1", "interface", "XPDR1-NETWORK1-OTU")
@@ -218,12 +217,11 @@ class TransportPCEtesting(unittest.TestCase):
                                     'supporting-port': 'CP1-CFP0-P1'
                                     }, **response['interface'][0]),
                               response['interface'][0])
-        self.assertIn(
-            response['interface'][0]['org-openroadm-optical-channel-interfaces:och'],
-            [{'frequency': '196.1000', 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': '-5', 'modulation-format': 'dp-qpsk'},
-             {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
-              'transmit-power': -5, 'modulation-format': 'dp-qpsk'}])
+        intf = response['interface'][0]['org-openroadm-optical-channel-interfaces:och']
+        self.assertEqual(intf['rate'], 'org-openroadm-common-types:R100G')
+        self.assertEqual(intf['modulation-format'], 'dp-qpsk')
+        self.assertEqual(float(intf['frequency']), 196.1)
+        self.assertEqual(float(intf['transmit-power']), -5)
  
      def test_07_check_interface_OTU(self):
          response = test_utils_rfc8040.check_node_attribute_request("SPDR-SC1", "interface", "XPDR1-NETWORK1-OTU")
diff --git a/tests/transportpce_tests/2.2.1/test12_end2end.py b/tests/transportpce_tests/2.2.1/test12_end2end.py

index ce56cf0d2020ac6290dbcb8e590fe73e95461e12..8d047bb58cdc0dc2c4dc697e645043e5e8b978b7 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test12_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test12_end2end.py
@@ -20,13 +20,13 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEFulltesting(unittest.TestCase):
  
      processes = None
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
          "sdnc-request-header": {
              "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
              "rpc-action": "service-create",
@@ -117,6 +117,16 @@ class TransportPCEFulltesting(unittest.TestCase):
          "due-date": "2016-11-28T00:00:01Z",
          "operator-contact": "pw1234"
      }
+
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
  
      WAITING = 20  # nominal value is 300
@@ -124,17 +134,17 @@ class TransportPCEFulltesting(unittest.TestCase):
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION),
-                                               ('roadma', cls.NODE_VERSION),
-                                               ('roadmc', cls.NODE_VERSION),
-                                               ('xpdrc', cls.NODE_VERSION)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION),
+                                                       ('roadma', cls.NODE_VERSION),
+                                                       ('roadmc', cls.NODE_VERSION),
+                                                       ('xpdrc', cls.NODE_VERSION)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):  # instruction executed before each test method
@@ -142,83 +152,91 @@ class TransportPCEFulltesting(unittest.TestCase):
          print("execution of {}".format(self.id().split(".")[-1]))
  
      def test_01_connect_xpdrA(self):
-        response = test_utils.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-A1", ('xpdra', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_02_connect_xpdrC(self):
-        response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_connect_rdmA(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_04_connect_rdmC(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
+        self.assertEqual(response.status_code, requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_05_connect_xprdA_N1_to_roadmA_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_07_connect_xprdC_xpdr1_N1_to_roadmC_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_08_connect_roadmC_PP1_to_xpdrC_xprd1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_09_connect_xprdA_N2_to_roadmA_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A1", "1", "2",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_10_connect_roadmA_PP2_to_xpdrA_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A1", "1", "2",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A1', 'xpdr-num': '1', 'network-num': '2',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_11_connect_xprdC_xpdr2_N1_to_roadmC_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "2", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_12_connect_roadmC_PP2_to_xpdrC_xpdr2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "2", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_13_add_omsAttributes_ROADMA_ROADMC(self):
@@ -233,7 +251,8 @@ class TransportPCEFulltesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_14_add_omsAttributes_ROADMC_ROADMA(self):
@@ -248,102 +267,86 @@ class TransportPCEFulltesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
  # test service-create for Eth service from xpdr to xpdr
      def test_15_create_eth_service2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
-    def test_16_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+    def test_16_get_eth_service2(self):
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service2')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_17_check_xc1_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-A1", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG2-TTP-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(5)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-nmc-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-nmc-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_18_check_xc1_ROADMC(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-C1", "roadm-connections/SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-C1", "roadm-connections", "SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-name': 'SRG1-PP2-TXRX-DEG1-TTP-TXRX-761:768',
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP2-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG1-TTP-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(5)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP2-TXRX-nmc-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-nmc-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_19_check_topo_XPDRA(self):
-        response = test_utils.get_ordm_topo_request("node/XPDR-A1-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A1-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({'frequency': 196.1,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.1,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40.0,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
              elif ele['tp-id'] in ('XPDR1-CLIENT1', 'XPDR1-CLIENT2'):
                  self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
              elif ele['tp-id'] == 'XPDR1-NETWORK2':
                  self.assertIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_20_check_topo_ROADMA_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
-        self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -352,17 +355,16 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
              elif ele['tp-id'] == 'SRG1-PP2-TXRX':
                  self.assertNotIn('avail-freq-maps', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_21_check_topo_ROADMA_DEG2(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
-        self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -374,85 +376,74 @@ class TransportPCEFulltesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_22_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"]
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1"
+        del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"]
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_23_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
          time.sleep(1)
  
      def test_24_check_xc1_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-A1", "roadm-connections/DEG2-TTP-TXRX-SRG1-PP2-TXRX-753:760")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-A1", "roadm-connections", "DEG2-TTP-TXRX-SRG1-PP2-TXRX-753:760")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-name': 'DEG2-TTP-TXRX-SRG1-PP2-TXRX-753:760',
                  'opticalControlMode': 'power'
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'DEG2-TTP-TXRX-nmc-753:760'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'SRG1-PP2-TXRX-nmc-753:760'},
-            res['roadm-connections'][0]['destination'])
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'DEG2-TTP-TXRX-nmc-753:760'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'SRG1-PP2-TXRX-nmc-753:760'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_25_check_topo_XPDRA(self):
-        response = test_utils.get_ordm_topo_request("node/XPDR-A1-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A1-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'XPDR1-NETWORK2':
-                self.assertEqual({'frequency': 196.05,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.05,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40.0,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
              elif ele['tp-id'] in ('XPDR1-CLIENT1'):
                  self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_26_check_topo_ROADMA_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -468,18 +459,17 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
              elif ele['tp-id'] == 'SRG1-PP3-TXRX':
                  self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_27_check_topo_ROADMA_DEG2(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -493,77 +483,82 @@ class TransportPCEFulltesting(unittest.TestCase):
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
                  self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        time.sleep(10)
+        time.sleep(1)
  
  #     creation service test on a non-available resource
      def test_28_create_eth_service3(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service3"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service3"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
-        self.assertIn('200', res['output']['configuration-response-common']['response-code'])
+                      response['output']['configuration-response-common']['response-message'])
+        self.assertIn('200', response['output']['configuration-response-common']['response-code'])
          time.sleep(self.WAITING)
  
  # add a test that check the openroadm-service-list still only contains 2 elements
      def test_29_delete_eth_service3(self):
-        response = test_utils.service_delete_request("service3")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service3"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Service \'service3\' does not exist in datastore',
-                      res['output']['configuration-response-common']['response-message'])
-        self.assertIn('500', res['output']['configuration-response-common']['response-code'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        self.assertIn('500', response['output']['configuration-response-common']['response-code'])
+        time.sleep(3)
  
      def test_30_delete_eth_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_31_delete_eth_service2(self):
-        response = test_utils.service_delete_request("service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_32_check_no_xc_ROADMA(self):
-        response = test_utils.check_netconf_node_request("ROADM-A1", "")
-        res = response.json()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertNotIn('roadm-connections', dict.keys(res['org-openroadm-device']))
+        response = test_utils_rfc8040.check_node_request("ROADM-A1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn('roadm-connections',
+                         dict.keys(response['org-openroadm-device']))
          time.sleep(2)
  
      def test_33_check_topo_XPDRA(self):
-        response = test_utils.get_ordm_topo_request("node/XPDR-A1-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A1-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT':
                  self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
              elif ele['org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK':
                  self.assertIn('tail-equipment-id',
                                dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
-                self.assertNotIn('wavelength', dict.keys(
-                    ele['org-openroadm-network-topology:xpdr-network-attributes']))
-        time.sleep(10)
+                self.assertNotIn('wavelength',
+                                 dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes']))
+        time.sleep(1)
  
      def test_34_check_topo_ROADMA_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Index 1 should  be available")
          self.assertEqual(freq_map_array[94], 255, "Index 2 should  be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] in ('SRG1-PP1-TXRX', 'SRG1-PP2-TXRX'):
                  freq_map = base64.b64decode(
@@ -579,18 +574,17 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[94], 255, "Index 2 should  be available")
              else:
                  self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
  
      def test_35_check_topo_ROADMA_DEG2(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
          self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -604,143 +598,111 @@ class TransportPCEFulltesting(unittest.TestCase):
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
                  self.assertEqual(freq_map_array[94], 255, "Lambda 2 should be available")
-        time.sleep(10)
+        time.sleep(1)
  
  # test service-create for Optical Channel (OC) service from srg-pp to srg-pp
      def test_36_create_oc_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADM-A1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADM-C1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1"
+        self.cr_serv_input_data["connection-type"] = "roadm-line"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "ROADM-A1"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "OC"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "ROADM-C1"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "OC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_37_get_oc_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'roadm-line')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['connection-type'], 'roadm-line')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
          time.sleep(1)
  
      def test_38_check_xc1_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-A1", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG2-TTP-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(7)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-nmc-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-nmc-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_39_check_xc1_ROADMC(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-C1", "roadm-connections/SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-C1", "roadm-connections", "SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-name': 'SRG1-PP1-TXRX-DEG1-TTP-TXRX-761:768',
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG1-TTP-TXRX-nmc-761:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(7)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-nmc-761:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG1-TTP-TXRX-nmc-761:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_40_create_oc_service2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
-        self.cr_serv_sample_data["input"]["connection-type"] = "roadm-line"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "ROADM-A1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "ROADM-C1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OC"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service2"
+        self.cr_serv_input_data["connection-type"] = "roadm-line"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "ROADM-A1"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "OC"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "ROADM-C1"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "OC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_41_get_oc_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'],
-            'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'roadm-line')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service2')
+        self.assertEqual(response['services'][0]['connection-type'], 'roadm-line')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_42_check_xc2_ROADMA(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-A1", "roadm-connections/SRG1-PP2-TXRX-DEG2-TTP-TXRX-753:760")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-A1", "roadm-connections", "SRG1-PP2-TXRX-DEG2-TTP-TXRX-753:760")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
          self.assertDictEqual(
              dict({
                  'connection-name': 'SRG1-PP2-TXRX-DEG2-TTP-TXRX-753:760',
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP2-TXRX-nmc-753:760'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG2-TTP-TXRX-nmc-753:760'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(2)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP2-TXRX-nmc-753:760'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-nmc-753:760'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_43_check_topo_ROADMA(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -756,42 +718,53 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
              elif ele['tp-id'] == 'SRG1-PP3-TXRX':
                  self.assertNotIn('org-openroadm-network-topology:pp-attributes', dict.keys(ele))
-        time.sleep(10)
+        time.sleep(1)
          self.test_27_check_topo_ROADMA_DEG2()
-        time.sleep(3)
+        time.sleep(1)
  
      def test_44_delete_oc_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_45_delete_oc_service2(self):
-        response = test_utils.service_delete_request("service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(20)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(self.WAITING)
  
      def test_46_get_no_oc_services(self):
-        print("start test")
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['service-list'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
          time.sleep(1)
  
      def test_47_get_no_xc_ROADMA(self):
-        response = test_utils.check_netconf_node_request("ROADM-A1", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['roadm-connections'][0], res['org-openroadm-device'])
+        response = test_utils_rfc8040.check_node_request("ROADM-A1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn('roadm-connections', dict.keys(response['org-openroadm-device']))
          time.sleep(1)
  
      def test_48_check_topo_ROADMA(self):
@@ -812,15 +785,18 @@ class TransportPCEFulltesting(unittest.TestCase):
              self.test_44_delete_oc_service1()
  
      def test_50_loop_create_eth_service(self):
-        response = test_utils.get_service_list_request("services/service1")
-        if response.status_code != requests.codes.not_found:
-            response = test_utils.service_delete_request("service1")
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        if response['status_code'] != 404:
+            self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+            response = test_utils_rfc8040.transportpce_api_rpc_request(
+                'org-openroadm-service', 'service-delete',
+                self.del_serv_input_data)
              time.sleep(5)
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "XPDR-A1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "XPDR-C1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "XPDR-A1"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "XPDR-C1"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
          for i in range(1, 3):
              # pylint: disable=consider-using-f-string
              print("iteration number {}".format(i))
@@ -832,20 +808,20 @@ class TransportPCEFulltesting(unittest.TestCase):
              self.test_31_delete_eth_service2()
  
      def test_51_disconnect_XPDRA(self):
-        response = test_utils.unmount_device("XPDR-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_52_disconnect_XPDRC(self):
-        response = test_utils.unmount_device("XPDR-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_53_disconnect_ROADMA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_54_disconnect_ROADMC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py b/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py

index 22707c43eea07aec84fe65150069de697b547e85..5a8a300796f7e70a7a9bd9c46587609ba0ee9d06 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py
+++ b/tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py
@@ -22,7 +22,7 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEtesting(unittest.TestCase):
@@ -31,7 +31,7 @@ class TransportPCEtesting(unittest.TestCase):
      WAITING = 20  # nominal value is 300
      NODE_VERSION = '2.2.1'
  
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
          "sdnc-request-header": {
              "request-id": "request-1",
              "rpc-action": "service-create",
@@ -123,128 +123,138 @@ class TransportPCEtesting(unittest.TestCase):
          "due-date": "2018-06-15T00:00:01Z",
          "operator-contact": "pw1234"
      }
+
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('spdra', cls.NODE_VERSION),
-                                               ('spdrb', cls.NODE_VERSION),
-                                               ('spdrc', cls.NODE_VERSION),
-                                               ('roadma', cls.NODE_VERSION),
-                                               ('roadmb', cls.NODE_VERSION),
-                                               ('roadmc', cls.NODE_VERSION)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('spdra', cls.NODE_VERSION),
+                                                       ('spdrb', cls.NODE_VERSION),
+                                                       ('spdrc', cls.NODE_VERSION),
+                                                       ('roadma', cls.NODE_VERSION),
+                                                       ('roadmb', cls.NODE_VERSION),
+                                                       ('roadmc', cls.NODE_VERSION)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):
          time.sleep(2)
  
      def test_001_connect_spdrA(self):
-        response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_002_connect_spdrB(self):
-        response = test_utils.mount_device("SPDR-SB1", ('spdrb', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("SPDR-SB1", ('spdrb', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_003_connect_spdrC(self):
-        response = test_utils.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_004_connect_rdmA(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_005_connect_rdmB(self):
-        response = test_utils.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_006_connect_rdmC(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_007_connect_sprdA_2_N1_to_roadmA_PP3(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SA1", "2", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP3-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SA1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP3-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_008_connect_roadmA_PP3_to_spdrA_2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SA1", "2", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP3-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SA1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP3-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_009_connect_sprdC_2_N1_to_roadmC_PP3(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SC1", "2", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP3-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SC1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP3-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_010_connect_roadmC_PP3_to_spdrC_2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SC1", "2", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP3-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SC1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP3-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_011_connect_sprdB_2_N1_to_roadmB_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SB1", "2", "1",
-                                                          "ROADM-B1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_012_connect_roadmB_PP1_to_spdrB_2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SB1", "2", "1",
-                                                          "ROADM-B1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_013_connect_sprdB_2_N2_to_roadmB_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SB1", "2", "2",
-                                                          "ROADM-B1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '2',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_014_connect_roadmB_PP2_to_spdrB_2_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SB1", "2", "2",
-                                                          "ROADM-B1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '2',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_015_add_omsAttributes_ROADMA_ROADMB(self):
@@ -259,8 +269,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_016_add_omsAttributes_ROADMB_ROADMA(self):
@@ -275,8 +285,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_017_add_omsAttributes_ROADMB_ROADMC(self):
@@ -291,8 +301,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_018_add_omsAttributes_ROADMC_ROADMB(self):
@@ -307,137 +317,145 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_019_create_OTS_ROADMA_DEG1(self):
-        response = test_utils.create_ots_oms_request("ROADM-A1", "DEG1-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-A1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        # time.sleep(10)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-A1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_020_create_OTS_ROADMB_DEG1(self):
-        response = test_utils.create_ots_oms_request("ROADM-B1", "DEG1-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-B1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        # time.sleep(10)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-B1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_021_create_OTS_ROADMB_DEG2(self):
-        response = test_utils.create_ots_oms_request("ROADM-B1", "DEG2-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-B1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        # time.sleep(10)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-B1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_022_create_OTS_ROADMC_DEG2(self):
-        response = test_utils.create_ots_oms_request("ROADM-C1", "DEG2-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-C1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        # time.sleep(10)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_023_calculate_span_loss_base_all(self):
-        url = "{}/operations/transportpce-olm:calculate-spanloss-base"
-        data = {
-            "input": {
-                "src-type": "all"
-            }
-        }
-        response = test_utils.post_request(url, data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Success',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-base',
+            {
+                'src-type': 'all'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Success', response["output"]["result"])
          self.assertIn({
              "spanloss": "25.7",
              "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "17.6",
              "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "23.6",
              "link-id": "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "23.6",
              "link-id": "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "25.7",
              "link-id": "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "17.6",
              "link-id": "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          time.sleep(5)
  
      def test_024_check_otn_topology(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nbNode = len(res['network'][0]['node'])
-        self.assertEqual(nbNode, 9, 'There should be 9 nodes')
-        self.assertNotIn('ietf-network-topology:link', res['network'][0],
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['node']), 9, 'There should be 9 nodes')
+        self.assertNotIn('ietf-network-topology:link', response['network'][0],
                           'otn-topology should have no link')
  
  # test service-create for OCH-OTU4 service from spdrA to spdrB
      def test_025_create_OCH_OTU4_service_AB(self):
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_026_get_OCH_OTU4_service_AB(self):
-        response = test_utils.get_service_list_request(
-            "services/service-OCH-OTU4-AB")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-OCH-OTU4-AB')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-OCH-OTU4-AB")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-OCH-OTU4-AB')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
  # Check correct configuration of devices
      def test_027_check_interface_och_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-761:768')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-761:768',
                                     'administrative-state': 'inService',
                                     'supporting-circuit-pack-name': 'CP5-CFP',
                                     'type': 'org-openroadm-interfaces:opticalChannel',
                                     'supporting-port': 'CP5-CFP-P1'
-                                   }, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(
-            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
-             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
-            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+                                   }, **response['interface'][0]),
+                             response['interface'][0])
+
+        self.assertEqual('org-openroadm-common-types:R100G',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['rate'])
+        self.assertEqual('dp-qpsk',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['modulation-format'])
+        self.assertEqual(196.1,
+                         float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['frequency']))
+        self.assertEqual(
+            -5,
+            float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['transmit-power']))
  
      def test_028_check_interface_OTU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTU',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -452,44 +470,45 @@ class TransportPCEtesting(unittest.TestCase):
                          'rate': 'org-openroadm-otn-common-types:OTU4',
                          'fec': 'scfec'
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(input_dict_2,
-                             res['interface'][0]
-                             ['org-openroadm-otn-otu-interfaces:otu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-OTU/otu")
-        self.assertEqual(response2.status_code, requests.codes.ok)
-        res2 = response2.json()['org-openroadm-otn-otu-interfaces:otu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-OTU', 'org-openroadm-otn-otu-interfaces:otu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-dapi'])
  
      def test_029_check_interface_och_spdrB(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-761:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-761:768')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-761:768',
                                     'administrative-state': 'inService',
                                     'supporting-circuit-pack-name': 'CP5-CFP',
                                     'type': 'org-openroadm-interfaces:opticalChannel',
                                     'supporting-port': 'CP5-CFP-P1'
-                                   }, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(
-            {'frequency': 196.1, 'rate': 'org-openroadm-common-types:R100G',
-             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
-            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+                                   }, **response['interface'][0]),
+                             response['interface'][0])
+
+        self.assertEqual('org-openroadm-common-types:R100G',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['rate'])
+        self.assertEqual('dp-qpsk',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['modulation-format'])
+        self.assertEqual(196.1,
+                         float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['frequency']))
+        self.assertEqual(
+            -5,
+            float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['transmit-power']))
  
      def test_030_check_interface_OTU4_spdrB(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTU',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -504,54 +523,61 @@ class TransportPCEtesting(unittest.TestCase):
                          'rate': 'org-openroadm-otn-common-types:OTU4',
                          'fec': 'scfec'
                          }
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(input_dict_2,
-                             res['interface'][0]
-                             ['org-openroadm-otn-otu-interfaces:otu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-OTU/otu")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['org-openroadm-otn-otu-interfaces:otu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-OTU', 'org-openroadm-otn-otu-interfaces:otu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-dapi'])
  
      def test_031_check_no_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['interface'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
  
      def test_032_check_openroadm_topo_spdra(self):
-        response = test_utils.get_ordm_topo_request("node/SPDR-SA1-XPDR2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        ele = res['node'][0]['ietf-network-topology:termination-point'][0]
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'SPDR-SA1-XPDR2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        ele = response['node']['ietf-network-topology:termination-point'][0]
          self.assertEqual('XPDR2-NETWORK1', ele['tp-id'])
-        self.assertEqual({'frequency': 196.1,
-                          'width': 40},
-                         ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+        self.assertEqual(
+            196.1,
+            float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+        self.assertEqual(
+            40,
+            float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
          self.assertEqual('ROADM-A1-SRG1--SRG1-PP3-TXRX',
                           ele['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'])
-        time.sleep(3)
+        time.sleep(1)
  
      def test_033_check_openroadm_topo_ROADMA_SRG(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP3-TXRX':
                  freq_map = base64.b64decode(
@@ -560,17 +586,16 @@ class TransportPCEtesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
              if ele['tp-id'] == 'SRG1-PP2-TXRX':
                  self.assertNotIn('avail-freq-maps', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_034_check_openroadm_topo_ROADMA_DEG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG1-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -582,17 +607,15 @@ class TransportPCEtesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_035_check_otn_topo_otu4_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 2)
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
          listLinkId = ['OTU4-SPDR-SA1-XPDR2-XPDR2-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK1',
                        'OTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK1toSPDR-SA1-XPDR2-XPDR2-NETWORK1']
-        for link in res['network'][0]['ietf-network-topology:link']:
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertIn(link['link-id'], listLinkId)
              self.assertEqual(
                  link['transportpce-networkutils:otn-link-type'], 'OTU4')
@@ -608,68 +631,65 @@ class TransportPCEtesting(unittest.TestCase):
  
  # test service-create for OCH-OTU4 service from spdrB to spdrC
  
+
      def test_036_create_OCH_OTU4_service_BC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-OCH-OTU4-BC"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SB1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSB"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-OCH-OTU4-BC"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SB1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSB"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_037_get_OCH_OTU4_service_BC(self):
-        response = test_utils.get_service_list_request(
-            "services/service-OCH-OTU4-BC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-OCH-OTU4-BC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-OCH-OTU4-BC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-OCH-OTU4-BC')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
  # Check correct configuration of devices
      def test_038_check_interface_och_spdrB(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-753:760")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-753:760')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-753:760',
                                     'administrative-state': 'inService',
                                     'supporting-circuit-pack-name': 'CP6-CFP',
                                     'type': 'org-openroadm-interfaces:opticalChannel',
                                     'supporting-port': 'CP1-CFP0-P1'
-                                   }, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(
-            {'frequency': 196.05, 'rate': 'org-openroadm-common-types:R100G',
-             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
-            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+                                   }, **response['interface'][0]),
+                             response['interface'][0])
+
+        self.assertEqual('org-openroadm-common-types:R100G',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['rate'])
+        self.assertEqual('dp-qpsk',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['modulation-format'])
+        self.assertEqual(196.05,
+                         float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['frequency']))
+        self.assertEqual(
+            -5,
+            float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['transmit-power']))
  
      def test_039_check_interface_OTU4_spdrB(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-OTU")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-OTU')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK2-OTU',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP6-CFP',
@@ -684,44 +704,45 @@ class TransportPCEtesting(unittest.TestCase):
                          'rate': 'org-openroadm-otn-common-types:OTU4',
                          'fec': 'scfec'
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(input_dict_2,
-                             res['interface'][0]
-                             ['org-openroadm-otn-otu-interfaces:otu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-NETWORK1-OTU/otu")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['org-openroadm-otn-otu-interfaces:otu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SC1', 'interface', 'XPDR2-NETWORK1-OTU', 'org-openroadm-otn-otu-interfaces:otu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-dapi'])
  
      def test_040_check_interface_och_spdrC(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-NETWORK1-753:760")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-761:768',
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-NETWORK1-753:760')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-753:760',
                                     'administrative-state': 'inService',
                                     'supporting-circuit-pack-name': 'CP5-CFP',
                                     'type': 'org-openroadm-interfaces:opticalChannel',
                                     'supporting-port': 'CP5-CFP-P1'
-                                   }, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(
-            {'frequency': 196.05, 'rate': 'org-openroadm-common-types:R100G',
-             'transmit-power': -5, 'modulation-format': 'dp-qpsk'},
-            res['interface'][0]['org-openroadm-optical-channel-interfaces:och'])
+                                   }, **response['interface'][0]),
+                             response['interface'][0])
+
+        self.assertEqual('org-openroadm-common-types:R100G',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['rate'])
+        self.assertEqual('dp-qpsk',
+                         response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['modulation-format'])
+        self.assertEqual(196.05,
+                         float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['frequency']))
+        self.assertEqual(
+            -5,
+            float(response['interface'][0]['org-openroadm-optical-channel-interfaces:och']['transmit-power']))
  
      def test_041_check_interface_OTU4_spdrC(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTU',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -736,67 +757,76 @@ class TransportPCEtesting(unittest.TestCase):
                          'rate': 'org-openroadm-otn-common-types:OTU4',
                          'fec': 'scfec'
                          }
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(input_dict_2,
-                             res['interface'][0]
-                             ['org-openroadm-otn-otu-interfaces:otu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-OTU/otu")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['org-openroadm-otn-otu-interfaces:otu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-OTU', 'org-openroadm-otn-otu-interfaces:otu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-dapi'])
  
      def test_042_check_no_interface_ODU4_spdrB(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['interface'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
  
      def test_043_check_openroadm_topo_spdrB(self):
-        response = test_utils.get_ordm_topo_request("node/SPDR-SB1-XPDR2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'SPDR-SB1-XPDR2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          # pylint: disable=consider-using-f-string
          for ele in liste_tp:
              if ele['tp-id'] == 'XPDR2-NETWORK1':
-                self.assertEqual({'frequency': 196.1,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.1,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
                  self.assertEqual('ROADM-B1-SRG1--SRG1-PP1-TXRX',
                                   ele['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'])
              elif ele['tp-id'] == 'XPDR2-NETWORK2':
-                self.assertEqual({'frequency': 196.05,
-                                  'width': 40},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.05,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    40,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
                  self.assertEqual('ROADM-B1-SRG1--SRG1-PP2-TXRX',
                                   ele['org-openroadm-network-topology:xpdr-network-attributes']['tail-equipment-id'])
              else:
-                print("ele = {}".format(ele))
                  self.assertNotIn('org-openroadm-network-topology:xpdr-network-attributes', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_044_check_openroadm_topo_ROADMB_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-B1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-B1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Lambda 1 should not be available")
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
          self.assertEqual(freq_map_array[93], 255, "Lambda 3 should be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -810,17 +840,16 @@ class TransportPCEtesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
              if ele['tp-id'] == 'SRG1-PP3-TXRX':
                  self.assertNotIn('avail-freq-maps', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_045_check_openroadm_topo_ROADMB_DEG2(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-B1-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-B1-DEG2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[94], 0, "Lambda 2 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -832,19 +861,17 @@ class TransportPCEtesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[94], 0, "Lambda 1 should not be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_046_check_otn_topo_otu4_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
          listLinkId = ['OTU4-SPDR-SA1-XPDR2-XPDR2-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK1',
                        'OTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK1toSPDR-SA1-XPDR2-XPDR2-NETWORK1',
                        'OTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK2toSPDR-SC1-XPDR2-XPDR2-NETWORK1',
                        'OTU4-SPDR-SC1-XPDR2-XPDR2-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK2']
-        for link in res['network'][0]['ietf-network-topology:link']:
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertIn(link['link-id'], listLinkId)
              self.assertEqual(
                  link['transportpce-networkutils:otn-link-type'], 'OTU4')
@@ -857,81 +884,73 @@ class TransportPCEtesting(unittest.TestCase):
              self.assertIn(
                  link['org-openroadm-common-network:opposite-link'], listLinkId)
  
+
  # test service-create for 100GE service from spdrA to spdrC via spdrB
+
      def test_047_create_100GE_service_ABC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-100GE-ABC"
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SA1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSA"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-100GE-ABC"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SA1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSA"
+        del self.cr_serv_input_data["service-a-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        del self.cr_serv_input_data["service-z-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_048_get_100GE_service_ABC(self):
-        response = test_utils.get_service_list_request(
-            "services/service-100GE-ABC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-100GE-ABC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-100GE-ABC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-100GE-ABC')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_049_check_interface_100GE_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-CLIENT1-ETHERNET')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict = {'name': 'XPDR2-CLIENT1-ETHERNET',
                        'administrative-state': 'inService',
                        'supporting-circuit-pack-name': 'CP2-QSFP1',
                        'type': 'org-openroadm-interfaces:ethernetCsmacd',
                        'supporting-port': 'CP2-QSFP1-P1'
                        }
-        self.assertDictEqual(dict(input_dict, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(
-            {'speed': 100000,
-             'fec': 'off'},
-            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertEqual(100000, response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['speed'])
+        self.assertEqual('off', response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['fec'])
  
      def test_050_check_interface_ODU4_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP2-QSFP1',
                          'supporting-interface': 'XPDR2-CLIENT1-ETHERNET',
                          'type': 'org-openroadm-interfaces:otnOdu',
                          'supporting-port': 'CP2-QSFP1-P1'}
+        # SAPI/DAPI are added in the Otu4 renderer
          input_dict_2 = {
-            'odu-function': 'org-openroadm-otn-common-types:ODU-TTP-CTP',
+            'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'terminated',
              'expected-dapi': 'AItaZ6nmyaKJ',
@@ -939,28 +958,32 @@ class TransportPCEtesting(unittest.TestCase):
              'tx-dapi': 'AKFnJJaijWiz',
              'tx-sapi': 'AItaZ6nmyaKJ'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_051_check_interface_ODU4_NETWORK_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -973,56 +996,51 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'monitored'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertNotIn('opu',
-                         dict.keys(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
+                         dict.keys(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
  
      def test_052_check_ODU4_connection_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1",
-            "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_053_check_interface_100GE_CLIENT_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-CLIENT1-ETHERNET')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict = {'name': 'XPDR2-CLIENT1-ETHERNET',
                        'administrative-state': 'inService',
                        'supporting-circuit-pack-name': 'CP2-QSFP1',
                        'type': 'org-openroadm-interfaces:ethernetCsmacd',
                        'supporting-port': 'CP2-QSFP1-P1'
                        }
-        self.assertDictEqual(dict(input_dict, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(
-            {'speed': 100000,
-             'fec': 'off'},
-            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertEqual(100000, response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['speed'])
+        self.assertEqual('off', response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['fec'])
  
      def test_054_check_interface_ODU4_CLIENT_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP2-QSFP1',
@@ -1040,28 +1058,32 @@ class TransportPCEtesting(unittest.TestCase):
              'tx-dapi': 'AItaZ6nmyaKJ',
              'tx-sapi': 'AKFnJJaijWiz'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_055_check_interface_ODU4_NETWORK_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -1074,38 +1096,36 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'monitored'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertNotIn('opu',
-                         dict.keys(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
+                         dict.keys(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
  
      def test_056_check_ODU4_connection_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1",
-            "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_057_check_interface_ODU4_NETWORK1_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -1116,20 +1136,20 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'monitored'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertNotIn('opu',
-                         dict.keys(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
+                         dict.keys(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
  
      def test_058_check_interface_ODU4_NETWORK2_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP6-CFP',
                          'type': 'org-openroadm-interfaces:otnOdu',
@@ -1139,147 +1159,154 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'monitored'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertNotIn('opu',
-                         dict.keys(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
+                         dict.keys(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
  
      def test_059_check_ODU4_connection_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1",
-            "odu-connection/XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'odu-connection', 'XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU4'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU4'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_060_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertEqual(
                  link['org-openroadm-otn-network-topology:available-bandwidth'], 0)
              self.assertEqual(
                  link['org-openroadm-otn-network-topology:used-bandwidth'], 100000)
  
      def test_061_delete_service_100GE_ABC(self):
-        response = test_utils.service_delete_request("service-100GE-ABC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE-ABC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_062_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 2)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 2)
+        time.sleep(1)
  
      def test_063_check_no_ODU4_connection_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
+        response = test_utils_rfc8040.check_node_request("SPDR-SA1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn(['odu-connection'][0], response['org-openroadm-device'])
          time.sleep(1)
  
      def test_064_check_no_interface_ODU4_NETWORK_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_065_check_no_interface_ODU4_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_066_check_no_interface_100GE_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-CLIENT1-ETHERNET')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_067_check_otn_topo_links(self):
          self.test_046_check_otn_topo_otu4_links()
  
      def test_068_delete_OCH_OTU4_service_AB(self):
-        response = test_utils.service_delete_request("service-OCH-OTU4-AB")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-OCH-OTU4-AB"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_069_delete_OCH_OTU4_service_BC(self):
-        response = test_utils.service_delete_request("service-OCH-OTU4-BC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-OCH-OTU4-BC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_070_get_no_service(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['service-list'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
          time.sleep(1)
  
      def test_071_check_no_interface_OTU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_072_check_no_interface_OCH_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-761:768")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-761:768')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_073_getLinks_OtnTopology(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn('ietf-network-topology:link', res['network'][0])
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn('ietf-network-topology:link', response['network'][0])
  
      def test_074_check_openroadm_topo_spdra(self):
-        response = test_utils.get_ordm_topo_request("node/SPDR-SA1-XPDR2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        tp = res['node'][0]['ietf-network-topology:termination-point'][0]
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'SPDR-SA1-XPDR2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        tp = response['node']['ietf-network-topology:termination-point'][0]
          self.assertEqual('XPDR2-NETWORK1', tp['tp-id'])
          self.assertNotIn('wavelength', dict.keys(
              tp['org-openroadm-network-topology:xpdr-network-attributes']))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_075_check_openroadm_topo_ROADMB_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-B1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-B1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
          self.assertEqual(freq_map_array[94], 255, "Lambda 1 should be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -1291,17 +1318,16 @@ class TransportPCEtesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:pp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[94], 255, "Lambda 1 should be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_076_check_openroadm_topo_ROADMB_DEG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-B1-DEG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-B1-DEG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG1-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -1313,17 +1339,16 @@ class TransportPCEtesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_077_check_openroadm_topo_ROADMB_DEG2(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-B1-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-B1-DEG2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -1335,43 +1360,37 @@ class TransportPCEtesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 255, "Lambda 1 should be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_078_disconnect_xponders_from_roadm(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
              if (link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT')
                      and ('SPDR-SB1' in link['link-id'] or 'ROADM-B1' in link['link-id'])):
-                link_name = link["link-id"]
-                response = test_utils.delete_request(url+link_name)
-                self.assertEqual(response.status_code, requests.codes.ok)
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_079_disconnect_spdrB(self):
-        response = test_utils.unmount_device("SPDR-SB1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("SPDR-SB1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_080_disconnect_roadmB(self):
-        response = test_utils.unmount_device("ROADM-B1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-B1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_081_remove_roadm_to_roadm_links(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
              if (link["org-openroadm-common-network:link-type"] == "ROADM-TO-ROADM"
                      and 'ROADM-B1' in link['link-id']):
-                link_name = link["link-id"]
-                response = test_utils.delete_request(url+link_name)
-                self.assertEqual(response.status_code, requests.codes.ok)
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_082_add_omsAttributes_ROADMA_ROADMC(self):
          # Config ROADMA-ROADMC oms-attributes
@@ -1385,8 +1404,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_083_add_omsAttributes_ROADMC_ROADMA(self):
@@ -1401,98 +1420,86 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_084_create_OCH_OTU4_service_AC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-OCH-OTU4-AC"
-        self.cr_serv_sample_data["input"]["connection-type"] = "infrastructure"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "OTU"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"] = "org-openroadm-otn-common-types:OTU4"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "OTU"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"] = "org-openroadm-otn-common-types:OTU4"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-OCH-OTU4-AC"
+        self.cr_serv_input_data["connection-type"] = "infrastructure"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "OTU"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        self.cr_serv_input_data["service-a-end"]["otu-service-rate"] = "org-openroadm-otn-common-types:OTU4"
+        self.cr_serv_input_data["service-z-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "OTU"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["otu-service-rate"] = "org-openroadm-otn-common-types:OTU4"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_085_get_OCH_OTU4_service_AC(self):
-        response = test_utils.get_service_list_request(
-            "services/service-OCH-OTU4-AC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-OCH-OTU4-AC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-OCH-OTU4-AC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-OCH-OTU4-AC')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
  # test service-create for 100GE service from spdrA to spdrC via spdrB
      def test_086_create_100GE_service_AC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-100GE-AC"
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SA1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSA"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-100GE-AC"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SA1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSA"
+        del self.cr_serv_input_data["service-a-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        del self.cr_serv_input_data["service-z-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_087_get_100GE_service_AC(self):
-        response = test_utils.get_service_list_request("services/service-100GE-AC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-100GE-AC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-100GE-AC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-100GE-AC')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_088_check_interface_OTU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTU',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -1507,26 +1514,23 @@ class TransportPCEtesting(unittest.TestCase):
                          'rate': 'org-openroadm-otn-common-types:OTU4',
                          'fec': 'scfec'
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-
-        self.assertDictEqual(input_dict_2,
-                             res['interface'][0]
-                             ['org-openroadm-otn-otu-interfaces:otu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-NETWORK1-OTU/otu")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['org-openroadm-otn-otu-interfaces:otu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SC1', 'interface', 'XPDR2-NETWORK1-OTU', 'org-openroadm-otn-otu-interfaces:otu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-dapi'])
  
      def test_089_check_interface_OTU4_spdrC(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR2-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR2-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTU',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -1541,20 +1545,18 @@ class TransportPCEtesting(unittest.TestCase):
                          'rate': 'org-openroadm-otn-common-types:OTU4',
                          'fec': 'scfec'
                          }
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(input_dict_2,
-                             res['interface'][0]
-                             ['org-openroadm-otn-otu-interfaces:otu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR2-NETWORK1-OTU/otu")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['org-openroadm-otn-otu-interfaces:otu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SA1', 'interface', 'XPDR2-NETWORK1-OTU', 'org-openroadm-otn-otu-interfaces:otu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-otu-interfaces:otu']['expected-dapi'])
  
      def test_090_check_configuration_spdra(self):
          self.test_049_check_interface_100GE_CLIENT_spdra()
@@ -1569,31 +1571,30 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_056_check_ODU4_connection_spdrc()
  
      def test_092_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 2)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertEqual(
                  link['org-openroadm-otn-network-topology:available-bandwidth'], 0)
              self.assertEqual(
                  link['org-openroadm-otn-network-topology:used-bandwidth'], 100000)
  
      def test_093_delete_100GE_service_AC(self):
-        response = test_utils.service_delete_request("service-100GE-AC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE-AC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_094_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 1)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 1)
+        time.sleep(1)
  
      def test_095_check_configuration_spdra(self):
          self.test_063_check_no_ODU4_connection_spdra()
@@ -1602,48 +1603,40 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_066_check_no_interface_100GE_CLIENT_spdra()
  
      def test_096_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 2)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertEqual(
                  link['org-openroadm-otn-network-topology:available-bandwidth'], 100000)
              self.assertEqual(
                  link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
  
      def test_097_disconnect_xponders_from_roadm(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
              if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
-                link_name = link["link-id"]
-                response = test_utils.delete_request(url+link_name)
-                self.assertEqual(response.status_code, requests.codes.ok)
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_098_disconnect_spdrA(self):
-        response = test_utils.unmount_device("SPDR-SA1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("SPDR-SA1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_099_disconnect_spdrC(self):
-        response = test_utils.unmount_device("SPDR-SC1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("SPDR-SC1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_100_disconnect_roadmA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_101_disconnect_roadmC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py

index 11de7104007c392eb7860173434f4484c1a07631..fc4c1ba63ee916026fdcf4aaf7392c1c32ef2344 100644 (file)
--- a/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py
+++ b/tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py
@@ -21,7 +21,7 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEtesting(unittest.TestCase):
@@ -30,7 +30,7 @@ class TransportPCEtesting(unittest.TestCase):
      WAITING = 20  # nominal value is 300
      NODE_VERSION = '2.2.1'
  
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
          "sdnc-request-header": {
              "request-id": "request-1",
              "rpc-action": "service-create",
@@ -122,128 +122,137 @@ class TransportPCEtesting(unittest.TestCase):
          "due-date": "2018-06-15T00:00:01Z",
          "operator-contact": "pw1234"
      }
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('spdra', cls.NODE_VERSION),
-                                               ('spdrb', cls.NODE_VERSION),
-                                               ('spdrc', cls.NODE_VERSION),
-                                               ('roadma', cls.NODE_VERSION),
-                                               ('roadmb', cls.NODE_VERSION),
-                                               ('roadmc', cls.NODE_VERSION)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('spdra', cls.NODE_VERSION),
+                                                       ('spdrb', cls.NODE_VERSION),
+                                                       ('spdrc', cls.NODE_VERSION),
+                                                       ('roadma', cls.NODE_VERSION),
+                                                       ('roadmb', cls.NODE_VERSION),
+                                                       ('roadmc', cls.NODE_VERSION)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):
          time.sleep(2)
  
      def test_001_connect_spdrA(self):
-        response = test_utils.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("SPDR-SA1", ('spdra', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_002_connect_spdrB(self):
-        response = test_utils.mount_device("SPDR-SB1", ('spdrb', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("SPDR-SB1", ('spdrb', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_003_connect_spdrC(self):
-        response = test_utils.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("SPDR-SC1", ('spdrc', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_004_connect_rdmA(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_005_connect_rdmB(self):
-        response = test_utils.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_006_connect_rdmC(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_007_connect_sprdA_1_N1_to_roadmA_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SA1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SA1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_008_connect_roadmA_PP1_to_spdrA_1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SA1", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SA1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_009_connect_sprdC_1_N1_to_roadmC_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SC1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SC1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_010_connect_roadmC_PP1_to_spdrC_1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SC1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SC1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_011_connect_sprdB_2_N1_to_roadmB_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SB1", "2", "1",
-                                                          "ROADM-B1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_012_connect_roadmB_PP1_to_spdrB_2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SB1", "2", "1",
-                                                          "ROADM-B1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_013_connect_sprdB_2_N2_to_roadmB_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("SPDR-SB1", "2", "2",
-                                                          "ROADM-B1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '2',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_014_connect_roadmB_PP2_to_spdrB_2_N2(self):
-        response = test_utils.connect_rdm_to_xpdr_request("SPDR-SB1", "2", "2",
-                                                          "ROADM-B1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'SPDR-SB1', 'xpdr-num': '2', 'network-num': '2',
+                             'rdm-node': 'ROADM-B1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
          time.sleep(2)
  
      def test_015_add_omsAttributes_ROADMA_ROADMB(self):
@@ -258,8 +267,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_016_add_omsAttributes_ROADMB_ROADMA(self):
@@ -274,8 +283,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_017_add_omsAttributes_ROADMB_ROADMC(self):
@@ -290,8 +299,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_018_add_omsAttributes_ROADMC_ROADMB(self):
@@ -306,122 +315,121 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
-            "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request("ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX",
+                                                           data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_019_create_OTS_ROADMA_DEG1(self):
-        response = test_utils.create_ots_oms_request("ROADM-A1", "DEG1-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-A1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-A1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_020_create_OTS_ROADMB_DEG1(self):
-        response = test_utils.create_ots_oms_request("ROADM-B1", "DEG1-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-B1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-B1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_021_create_OTS_ROADMB_DEG2(self):
-        response = test_utils.create_ots_oms_request("ROADM-B1", "DEG2-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-B1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-B1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_022_create_OTS_ROADMC_DEG2(self):
-        response = test_utils.create_ots_oms_request("ROADM-C1", "DEG2-TTP-TXRX")
-        time.sleep(10)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-C1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1',
-                      res["output"]["result"])
+                      response["output"]["result"])
  
      def test_023_calculate_span_loss_base_all(self):
-        url = "{}/operations/transportpce-olm:calculate-spanloss-base"
-        data = {
-            "input": {
-                "src-type": "all"
-            }
-        }
-        response = test_utils.post_request(url, data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Success',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-base',
+            {
+                'src-type': 'all'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Success', response["output"]["result"])
          self.assertIn({
              "spanloss": "25.7",
              "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "17.6",
              "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "23.6",
              "link-id": "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "23.6",
              "link-id": "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "25.7",
              "link-id": "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "17.6",
              "link-id": "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          time.sleep(5)
  
      def test_024_check_otn_topology(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nbNode = len(res['network'][0]['node'])
-        self.assertEqual(nbNode, 9, 'There should be 9 nodes')
-        self.assertNotIn('ietf-network-topology:link', res['network'][0],
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['node']), 9, 'There should be 9 nodes')
+        self.assertNotIn('ietf-network-topology:link', response['network'][0],
                           'otn-topology should have no link')
  
  # test service-create for OCH-OTU4 service from spdrA to spdrB
      def test_025_create_OCH_OTU4_service_AB(self):
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_026_get_OCH_OTU4_service_AB(self):
-        response = test_utils.get_service_list_request(
-            "services/service-OCH-OTU4-AB")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-OCH-OTU4-AB')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-OCH-OTU4-AB")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-OCH-OTU4-AB')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_027_check_otn_topo_otu4_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 2)
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
          listLinkId = ['OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK1',
                        'OTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1']
-        for link in res['network'][0]['ietf-network-topology:link']:
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertIn(link['link-id'], listLinkId)
              self.assertEqual(
                  link['transportpce-networkutils:otn-link-type'], 'OTU4')
@@ -436,54 +444,45 @@ class TransportPCEtesting(unittest.TestCase):
  
  # test service-create for OCH-OTU4 service from spdrB to spdrC
      def test_028_create_OCH_OTU4_service_BC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-OCH-OTU4-BC"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SB1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSB"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-OCH-OTU4-BC"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SB1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSB"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_029_get_OCH_OTU4_service_BC(self):
-        response = test_utils.get_service_list_request(
-            "services/service-OCH-OTU4-BC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-OCH-OTU4-BC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-OCH-OTU4-BC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-OCH-OTU4-BC')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_030_check_otn_topo_otu4_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
          listLinkId = ['OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK1',
                        'OTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1',
                        'OTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK2toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                        'OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK2']
-        for link in res['network'][0]['ietf-network-topology:link']:
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertIn(link['link-id'], listLinkId)
              self.assertEqual(
                  link['transportpce-networkutils:otn-link-type'], 'OTU4')
@@ -496,62 +495,56 @@ class TransportPCEtesting(unittest.TestCase):
              self.assertIn(
                  link['org-openroadm-common-network:opposite-link'], listLinkId)
  
+
  # test service-create for ODU4 service from spdrA to spdrC via spdrB
+
      def test_031_create_ODU4_service(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-ODU4-ABC"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SA1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSA"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-ODU4-ABC"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SA1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSA"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU"
+        del self.cr_serv_input_data["service-a-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "ODU"
+        del self.cr_serv_input_data["service-z-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_032_get_ODU4_service_ABC(self):
-        response = test_utils.get_service_list_request(
-            "services/service-ODU4-ABC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-ODU4-ABC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-ODU4-ABC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-ODU4-ABC')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_033_check_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
                          'type': 'org-openroadm-interfaces:otnOdu',
                          'supporting-port': 'CP1-CFP0-P1'}
-        #      SAPI/DAPI are added in the Otu4 renderer
          input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
                          'rate': 'org-openroadm-otn-common-types:ODU4',
                          'expected-dapi': 'H/OelLynehI=',
@@ -559,64 +552,59 @@ class TransportPCEtesting(unittest.TestCase):
                          'tx-dapi': 'AMf1n5hK6Xkk',
                          'tx-sapi': 'H/OelLynehI='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
                                    **input_dict_2),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-                             )
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU4', 'org-openroadm-otn-odu-interfaces:odu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_034_check_interface_ODU4_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
                          'type': 'org-openroadm-interfaces:otnOdu',
                          'supporting-port': 'CP1-CFP0-P1'}
-        # SAPI/DAPI are added in the Otu4 renderer
          input_dict_2 = {'odu-function': 'org-openroadm-otn-common-types:ODU-TTP',
                          'rate': 'org-openroadm-otn-common-types:ODU4',
                          'expected-dapi': 'AMf1n5hK6Xkk',
                          'expected-sapi': 'H/OelLynehI=',
                          'tx-dapi': 'H/OelLynehI=',
                          'tx-sapi': 'AMf1n5hK6Xkk'}
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
                                    **input_dict_2),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-                             )
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute2_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU4', 'org-openroadm-otn-odu-interfaces:odu')
+        self.assertEqual(response2['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'], response2['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'], response2['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_035_check_interface_ODU4_NETWORK1_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP5-CFP',
@@ -626,20 +614,18 @@ class TransportPCEtesting(unittest.TestCase):
              'odu-function': 'org-openroadm-otn-common-types:ODU-CTP',
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'monitored'}
-
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertNotIn('opu',
-                         dict.keys(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
+                         dict.keys(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
  
      def test_036_check_interface_ODU4_NETWORK2_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP6-CFP',
@@ -650,40 +636,35 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'monitored'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertNotIn('opu',
-                         dict.keys(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
+                         dict.keys(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']))
  
      def test_037_check_ODU4_connection_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1",
-            "odu-connection/XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'odu-connection', 'XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
-            'connection-name':
-            'XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4',
+            'connection-name': 'XPDR2-NETWORK1-ODU4-x-XPDR2-NETWORK2-ODU4',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU4'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU4'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_038_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 6)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 6)
+        for link in response['network'][0]['ietf-network-topology:link']:
              if 'OTU4' in link['link-id']:
                  self.assertEqual(
                      link['org-openroadm-otn-network-topology:available-bandwidth'], 0)
@@ -705,9 +686,9 @@ class TransportPCEtesting(unittest.TestCase):
                  self.fail("this link should not exist")
  
      def test_039_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] == 'SPDR-SA1-XPDR1' or node['node-id'] == 'SPDR-SC1-XPDR1':
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -719,64 +700,57 @@ class TransportPCEtesting(unittest.TestCase):
                          self.assertEqual(xpdrTpPortConAt['odtu-tpn-pool'][0]['odtu-type'],
                                           'org-openroadm-otn-common-types:ODTU4.ts-Allocated')
  
+
  # test service-create for 10GE service from spdr to spdr
+
      def test_040_create_10GE_service(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1-10GE"
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "10"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "10"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1-10GE"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "10"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_input_data["service-a-end"]["odu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["service-rate"] = "10"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_input_data["service-z-end"]["odu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_041_get_10GE_service1(self):
-        response = test_utils.get_service_list_request(
-            "services/service1-10GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1-10GE')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1-10GE")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1-10GE')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_042_check_interface_10GE_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ETHERNET10G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G',
                        'administrative-state': 'inService',
                        'supporting-circuit-pack-name': 'CP1-SFP4',
                        'type': 'org-openroadm-interfaces:ethernetCsmacd',
                        'supporting-port': 'CP1-SFP4-P1'
                        }
-        self.assertDictEqual(dict(input_dict, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(
-            {'speed': 10000},
-            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertEqual(10000, response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['speed'])
  
      def test_043_check_interface_ODU2E_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-SFP4',
@@ -792,28 +766,32 @@ class TransportPCEtesting(unittest.TestCase):
              'tx-dapi': 'BcwI5xz79t8=',
              'tx-sapi': 'B68VWipZAU0='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertDictEqual(
              {'payload-type': '03', 'exp-payload-type': '03'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_044_check_interface_ODU2E_NETWORK_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -826,59 +804,53 @@ class TransportPCEtesting(unittest.TestCase):
              'monitoring-mode': 'monitored'}
          input_dict_3 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
-                                      'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
-        self.assertIn(1, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                                  ['parent-odu-allocation']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn(1, response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['trib-slots'])
  
      def test_045_check_ODU2E_connection_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1",
-            "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'odu-connection', 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e',
              'direction': 'bidirectional'
          }
-
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_046_check_interface_10GE_CLIENT_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-CLIENT1-ETHERNET10G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ETHERNET10G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict = {'name': 'XPDR1-CLIENT1-ETHERNET10G',
                        'administrative-state': 'inService',
                        'supporting-circuit-pack-name': 'CP1-SFP4',
                        'type': 'org-openroadm-interfaces:ethernetCsmacd',
                        'supporting-port': 'CP1-SFP4-P1'
                        }
-        self.assertDictEqual(dict(input_dict, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(
-            {'speed': 10000},
-            res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertEqual(10000, response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']['speed'])
  
      def test_047_check_interface_ODU2E_CLIENT_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-CLIENT1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-CLIENT1-ODU2e',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-SFP4',
@@ -894,28 +866,32 @@ class TransportPCEtesting(unittest.TestCase):
              'tx-dapi': 'B68VWipZAU0=',
              'tx-sapi': 'BcwI5xz79t8='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertDictEqual(
              {'payload-type': '03', 'exp-payload-type': '03'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_048_check_interface_ODU2E_NETWORK_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU2e',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -928,47 +904,40 @@ class TransportPCEtesting(unittest.TestCase):
              'monitoring-mode': 'monitored'}
          input_dict_3 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+                                  **input_dict_2),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             )
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
-                                      'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
-            'parent-odu-allocation'])
-        self.assertIn(1,
-                      res['interface'][0][
-                          'org-openroadm-otn-odu-interfaces:odu'][
-                          'parent-odu-allocation']['trib-slots'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                                  ['parent-odu-allocation']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn(1, response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                      ['trib-slots'])
  
      def test_049_check_ODU2E_connection_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1",
-            "odu-connection/XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'odu-connection', 'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR1-CLIENT1-ODU2e-x-XPDR1-NETWORK1-ODU2e',
              'direction': 'bidirectional'
          }
-
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR1-NETWORK1-ODU2e'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR1-CLIENT1-ODU2e'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_050_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 6)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 6)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                             'ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1')):
@@ -978,9 +947,9 @@ class TransportPCEtesting(unittest.TestCase):
                      link['org-openroadm-otn-network-topology:used-bandwidth'], 10000)
  
      def test_051_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] == 'SPDR-SA1-XPDR1' or node['node-id'] == 'SPDR-SC1-XPDR1':
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -996,49 +965,47 @@ class TransportPCEtesting(unittest.TestCase):
                              1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
  
      def test_052_delete_10GE_service(self):
-        response = test_utils.service_delete_request("service1-10GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-10GE"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_053_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 3)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 3)
+        time.sleep(1)
  
      def test_054_check_no_ODU2e_connection_spdra(self):
-        response = test_utils.check_netconf_node_request("SPDR-SA1", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
+        response = test_utils_rfc8040.check_node_request("SPDR-SA1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn(['odu-connection'][0], response['org-openroadm-device'])
          time.sleep(1)
  
      def test_055_check_no_interface_ODU2E_NETWORK_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_056_check_no_interface_ODU2E_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-CLIENT1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_057_check_no_interface_10GE_CLIENT_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-CLIENT1-ETHERNET10G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-CLIENT1-ETHERNET10G')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_058_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 6)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 6)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1',
                             'ODTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1')):
@@ -1048,9 +1015,9 @@ class TransportPCEtesting(unittest.TestCase):
                      link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
  
      def test_059_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if (node['node-id'] == 'SPDR-SA1-XPDR1' or node['node-id'] == 'SPDR-SC1-XPDR1'):
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -1061,52 +1028,52 @@ class TransportPCEtesting(unittest.TestCase):
                              len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 80)
  
      def test_060_delete_ODU4_service(self):
-        response = test_utils.service_delete_request("service-ODU4-ABC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-ODU4-ABC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_061_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 2)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 2)
+        time.sleep(1)
  
      def test_062_check_no_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_063_check_no_interface_ODU4_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_064_check_no_ODU4_connection_spdrb(self):
-        response = test_utils.check_netconf_node_request("SPDR-SB1", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
+        response = test_utils_rfc8040.check_node_request("SPDR-SB1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn(['odu-connection'][0], response['org-openroadm-device'])
          time.sleep(1)
  
      def test_065_check_no_interface_ODU4_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_066_check_otn_topo_links(self):
          self.test_030_check_otn_topo_otu4_links()
  
      def test_067_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] == 'SPDR-SA1-XPDR1' or node['node-id'] == 'SPDR-SC1-XPDR1':
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -1118,53 +1085,46 @@ class TransportPCEtesting(unittest.TestCase):
  
  # test service-create for ODU4 service from spdrA to spdrB
      def test_068_create_ODU4_service_AB(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-ODU4-AB"
-        self.cr_serv_sample_data["input"]["connection-type"] = "infrastructure"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU"
-        self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SB1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSB"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU"
-        self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-ODU4-AB"
+        self.cr_serv_input_data["connection-type"] = "infrastructure"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU"
+        self.cr_serv_input_data["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SB1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSB"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "ODU"
+        self.cr_serv_input_data["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODU4"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK1"
+
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_069_get_ODU4_service_AB(self):
-        response = test_utils.get_service_list_request(
-            "services/service-ODU4-AB")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-ODU4-AB')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-ODU4-AB")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-ODU4-AB')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_070_check_interface_ODU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -1178,29 +1138,32 @@ class TransportPCEtesting(unittest.TestCase):
                          'tx-dapi': 'X+8cRNi+HbE=',
                          'tx-sapi': 'H/OelLynehI='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
                                    **input_dict_2),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                               )
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_071_check_interface_ODU4_spdrb_N1(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -1214,66 +1177,66 @@ class TransportPCEtesting(unittest.TestCase):
                          'tx-dapi': 'H/OelLynehI=',
                          'tx-sapi': 'X+8cRNi+HbE='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
                                    **input_dict_2),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                               )
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
  # test service-create for ODU4 service from spdrB to spdrC
      def test_072_create_ODU4_service_BC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service-ODU4-BC"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["node-id"] = "SPDR-SC1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["clli"] = "NodeSC"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-ODU4-BC"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SB1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSB"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SB1-XPDR2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-NETWORK2"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-NETWORK1"
+
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_073_get_ODU4_service_AB(self):
-        response = test_utils.get_service_list_request(
-            "services/service-ODU4-BC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-ODU4-BC')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-ODU4-BC")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-ODU4-BC')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_074_check_interface_ODU4_spdrb_N2(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -1287,29 +1250,31 @@ class TransportPCEtesting(unittest.TestCase):
                          'tx-dapi': 'AMf1n5hK6Xkk',
                          'tx-sapi': 'X+8cRNi+HbI='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
                                    **input_dict_2),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                               )
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
  
      def test_075_check_interface_ODU4_spdrc(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SC1", "interface/XPDR1-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SC1', 'interface', 'XPDR1-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -1322,48 +1287,57 @@ class TransportPCEtesting(unittest.TestCase):
                          'expected-sapi': 'X+8cRNi+HbI=',
                          'tx-dapi': 'X+8cRNi+HbI=',
                          'tx-sapi': 'AMf1n5hK6Xkk'}
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'],
                                    **input_dict_2),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
                               )
          self.assertDictEqual(
              {'payload-type': '21', 'exp-payload-type': '21'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        response2 = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res2 = response2.json()['interface'][0]['org-openroadm-otn-odu-interfaces:odu']
-        self.assertEqual(input_dict_2['tx-sapi'], res2['tx-dapi'])
-        self.assertEqual(input_dict_2['tx-sapi'], res2['expected-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['tx-sapi'])
-        self.assertEqual(input_dict_2['tx-dapi'], res2['expected-dapi'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+        response2 = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-dapi'])
+        self.assertEqual(input_dict_2['tx-sapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['tx-sapi'])
+        self.assertEqual(input_dict_2['tx-dapi'],
+                         response2['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['expected-dapi'])
+
  
  # test service-create for 10GE service from spdr to spdr
+
      def test_076_create_10GE_service_ABC(self):
-        # pylint: disable=line-too-long
-        self.cr_serv_sample_data["input"]["service-name"] = "service1-10GE"
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["node-id"] = "SPDR-SA1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["clli"] = "NodeSA"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "10"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "10"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1-10GE"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["node-id"] = "SPDR-SA1"
+        self.cr_serv_input_data["service-a-end"]["clli"] = "NodeSA"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "10"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_input_data["service-a-end"]["odu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SA1-XPDR1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["node-id"] = "SPDR-SC1"
+        self.cr_serv_input_data["service-z-end"]["clli"] = "NodeSC"
+        self.cr_serv_input_data["service-z-end"]["service-rate"] = "10"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_input_data["service-z-end"]["odu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"] = "SPDR-SC1-XPDR1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_077_check_configuration_spdra_spdrc(self):
@@ -1377,10 +1351,9 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_049_check_ODU2E_connection_spdrc()
  
      def test_078_check_interface_ODU2E_NETWORK1_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU2e',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -1393,23 +1366,22 @@ class TransportPCEtesting(unittest.TestCase):
              'monitoring-mode': 'monitored'}
          input_dict_3 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
                                        'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
-        self.assertIn(1, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn(1, response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['trib-slots'])
  
      def test_079_check_interface_ODU2E_NETWORK2_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK2-ODU2e',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': 'CP1-CFP0',
@@ -1422,44 +1394,40 @@ class TransportPCEtesting(unittest.TestCase):
              'monitoring-mode': 'monitored'}
          input_dict_3 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
                                        'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
-        self.assertIn(1, res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn(1, response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['trib-slots'])
  
      def test_080_check_ODU2E_connection_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1",
-            "odu-connection/XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'odu-connection', 'XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR2-NETWORK1-ODU2e-x-XPDR2-NETWORK2-ODU2e',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK2-ODU2e'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-NETWORK1-ODU2e'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_081_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 8)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 8)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK1',
                             'ODTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1',
@@ -1474,19 +1442,20 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_051_check_otn_topo_tp()
  
      def test_083_delete_10GE_service(self):
-        response = test_utils.service_delete_request("service1-10GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-10GE"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_084_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 4)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 4)
+        time.sleep(1)
  
      def test_085_check_configuration_spdra(self):
          self.test_054_check_no_ODU2e_connection_spdra()
@@ -1495,29 +1464,26 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_057_check_no_interface_10GE_CLIENT_spdra()
  
      def test_086_check_no_ODU2e_connection_spdrb(self):
-        response = test_utils.check_netconf_node_request("SPDR-SB1", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
+        response = test_utils_rfc8040.check_node_request("SPDR-SB1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn(['odu-connection'][0], response['org-openroadm-device'])
          time.sleep(1)
  
      def test_087_check_no_interface_ODU2E_NETWORK1_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK1-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK1-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_088_check_no_interface_ODU2E_NETWORK2_spdrb(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SB1", "interface/XPDR2-NETWORK2-ODU2e")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SB1', 'interface', 'XPDR2-NETWORK2-ODU2e')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_089_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 8)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 8)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SB1-XPDR2-XPDR2-NETWORK1',
                             'ODTU4-SPDR-SB1-XPDR2-XPDR2-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1',
@@ -1532,19 +1498,23 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_059_check_otn_topo_tp()
  
      def test_091_delete_ODU4_service_AB(self):
-        response = test_utils.service_delete_request("service-ODU4-AB")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-ODU4-AB"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_092_delete_ODU4_service_BC(self):
-        response = test_utils.service_delete_request("service-ODU4-BC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-ODU4-BC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_093_check_global_config(self):
@@ -1557,96 +1527,98 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_067_check_otn_topo_tp()
  
      def test_094_delete_OCH_OTU4_service_AB(self):
-        response = test_utils.service_delete_request("service-OCH-OTU4-AB")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-OCH-OTU4-AB"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_095_delete_OCH_OTU4_service_BC(self):
-        response = test_utils.service_delete_request("service-OCH-OTU4-BC")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-OCH-OTU4-BC"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_096_get_no_service(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['service-list'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
          time.sleep(1)
  
      def test_097_check_no_interface_OTU4_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-OTU")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-OTU')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_098_check_no_interface_OCH_spdra(self):
-        response = test_utils.check_netconf_node_request(
-            "SPDR-SA1", "interface/XPDR1-NETWORK1-1")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'SPDR-SA1', 'interface', 'XPDR1-NETWORK1-1')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_099_getLinks_OtnTopology(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn('ietf-network-topology:link', res['network'][0])
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn('ietf-network-topology:link', response['network'][0])
  
      def test_100_disconnect_xponders_from_roadm(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
-            if (link["org-openroadm-common-network:link-type"] == "XPONDER-OUTPUT" or
-                    link["org-openroadm-common-network:link-type"] == "XPONDER-INPUT"):
-                link_name = link["link-id"]
-                response = test_utils.delete_request(url+link_name)
-                self.assertEqual(response.status_code, requests.codes.ok)
+            if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_101_check_openroadm_topology(self):
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          self.assertEqual(28, len(links), 'Topology should contain 28 links')
  
      def test_102_disconnect_spdrA(self):
-        response = test_utils.unmount_device("SPDR-SA1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("SPDR-SA1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_103_disconnect_spdrC(self):
-        response = test_utils.unmount_device("SPDR-SC1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("SPDR-SC1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_104_disconnect_spdrB(self):
-        response = test_utils.unmount_device("SPDR-SB1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("SPDR-SB1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_105_disconnect_roadmA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_106_disconnect_roadmB(self):
-        response = test_utils.unmount_device("ROADM-B1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-B1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_107_disconnect_roadmC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/7.1/test01_portmapping.py b/tests/transportpce_tests/7.1/test01_portmapping.py

index a7bf2b9490e898c02227e17223366f6123c4bf49..1f3f7791f3b1e548b9438ed997096f1b0dba3988 100644 (file)
--- a/tests/transportpce_tests/7.1/test01_portmapping.py
+++ b/tests/transportpce_tests/7.1/test01_portmapping.py
@@ -58,7 +58,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
  
      # Check node info in the port-mappings
      def test_03_xpdr_portmapping_info(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual(
              {'node-type': 'xpdr',
@@ -71,7 +71,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
  
      # Check the if-capabilities and the other details for network
      def test_04_tpdr_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR1-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR1-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability':
@@ -90,7 +90,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_05_tpdr_portmapping_CLIENT1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR1-CLIENT1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR1-CLIENT1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability': ['org-openroadm-port-types:if-400GE'],
@@ -110,7 +110,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
  
      # Check the port-mapping for the switch-client and switch-network port-quals
      def test_06_mpdr_portmapping_NETWORK1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn(
              {'supported-interface-capability':
@@ -128,7 +128,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
              response['mapping'])
  
      def test_07_mpdr_portmapping_CLIENT1(self):
-        res = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-CLIENT1")
+        res = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-CLIENT1")
          self.assertEqual(res['status_code'], requests.codes.ok)
          self.assertIn('org-openroadm-port-types:if-100GE-ODU4',
                        res['mapping'][0]['supported-interface-capability'])
@@ -150,24 +150,24 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
  
      # Added test to check mc-capability-profile for a transponder
      def test_08_check_mccapprofile(self):
-        res = test_utils_rfc8040.portmapping_mc_capa_request("XPDR-A2", "XPDR-mcprofile")
+        res = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mc-capabilities", "XPDR-mcprofile")
          self.assertEqual(res['status_code'], requests.codes.ok)
          self.assertEqual(res['mc-capabilities'][0]['mc-node-name'], 'XPDR-mcprofile')
          self.assertEqual(str(res['mc-capabilities'][0]['center-freq-granularity']), '3.125')
          self.assertEqual(str(res['mc-capabilities'][0]['slot-width-granularity']), '6.25')
  
      def test_09_mpdr_switching_pool(self):
-        response = test_utils_rfc8040.portmapping_switching_pool_request("XPDR-A2", "1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "switching-pool-lcp", "1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertEqual("blocking",
-                         response['switching_pool'][0]['switching-pool-type'])
+                         response['switching-pool-lcp'][0]['switching-pool-type'])
          self.assertEqual(2,
-                         len(response['switching_pool'][0]['non-blocking-list']))
+                         len(response['switching-pool-lcp'][0]['non-blocking-list']))
          self.assertIn(
              {'nbl-number': 2,
               'interconnect-bandwidth': 0,
               'lcp-list': ['XPDR2-NETWORK1', 'XPDR2-CLIENT2']},
-            response['switching_pool'][0]['non-blocking-list'])
+            response['switching-pool-lcp'][0]['non-blocking-list'])
  
      def test_10_xpdr_device_disconnection(self):
          response = test_utils_rfc8040.unmount_device("XPDR-A2")
@@ -182,7 +182,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
                           'Request could not be completed because the relevant data model content does not exist')
  
      def test_12_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.conflict)
          self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
          self.assertEqual(response['node-info']['error-tag'], 'data-missing')
diff --git a/tests/transportpce_tests/7.1/test02_otn_renderer.py b/tests/transportpce_tests/7.1/test02_otn_renderer.py

index c4a0ecdb4b17bd3d2d7436c6c66b96b96d221129..4bceb0993609e2e8cef5ab61e039dc89eedb89e9 100644 (file)
--- a/tests/transportpce_tests/7.1/test02_otn_renderer.py
+++ b/tests/transportpce_tests/7.1/test02_otn_renderer.py
@@ -91,7 +91,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
              response['output']['node-interface'])
  
      def test_03_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK2_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC2"
          self.assertIn(
@@ -182,7 +182,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
               'odu-interface-id': ['XPDR2-NETWORK1-ODUC2']}, response['output']['node-interface'])
  
      def test_08_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK2_CHECK_DICT["supporting-oducn"] = "XPDR2-NETWORK1-ODUC2"
          self.assertIn(
@@ -392,7 +392,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
  
      # Check if port-mapping data is updated, where the supporting-oducn is deleted
      def test_21a_check_no_oduc2(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-oducn"])
  
      # 1f) Delete OTUC2 device interfaces
@@ -431,7 +431,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_25a_check_no_otuc2(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-otucn"])
  
      # 2a) create a OTUC3 device renderer
@@ -463,7 +463,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(sorted(response['output']['node-interface'][0]['och-interface-id']), expected_sorted_list)
  
      def test_27_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK2_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC3"
          self.assertIn(
@@ -555,7 +555,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
               'odu-interface-id': ['XPDR2-NETWORK1-ODUC3']}, response['output']['node-interface'])
  
      def test_32_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK2_CHECK_DICT["supporting-oducn"] = "XPDR2-NETWORK1-ODUC3"
          self.assertIn(
@@ -617,7 +617,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_35a_check_no_oduc3(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-oducn"])
  
      # 2f) Delete OTUC3 device interfaces
@@ -655,7 +655,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_39a_check_no_otuc3(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-otucn"])
  
      # 3a) create a OTUC4 device renderer
@@ -687,7 +687,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(sorted(response['output']['node-interface'][0]['och-interface-id']), expected_sorted_list)
  
      def test_41_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK2_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC4"
          self.assertIn(
@@ -779,7 +779,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
               'odu-interface-id': ['XPDR2-NETWORK1-ODUC4']}, response['output']['node-interface'])
  
      def test_46_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response['status_code'], requests.codes.ok)
          self.NETWORK2_CHECK_DICT["supporting-oducn"] = "XPDR2-NETWORK1-ODUC4"
          self.assertIn(
@@ -841,7 +841,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_49a_check_no_oduc4(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-oducn"])
  
      # 3f) Delete OTUC4 device interfaces
@@ -879,7 +879,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_53a_check_no_otuc4(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-otucn"])
  
      # Disconnect the XPDR
@@ -896,7 +896,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
                           'Request could not be completed because the relevant data model content does not exist')
  
      def test_56_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "node-info", None)
          self.assertEqual(response['status_code'], requests.codes.conflict)
          self.assertIn(response['node-info']['error-type'], ('protocol', 'application'))
          self.assertEqual(response['node-info']['error-tag'], 'data-missing')
diff --git a/tests/transportpce_tests/7.1/test03_renderer_or_modes.py b/tests/transportpce_tests/7.1/test03_renderer_or_modes.py

index 3d8ee82a0a439646dd392a3ed870322d98ad1e8f..ecb41ef931039479b2e7e7685f7bc8fa6e79cc0e 100644 (file)
--- a/tests/transportpce_tests/7.1/test03_renderer_or_modes.py
+++ b/tests/transportpce_tests/7.1/test03_renderer_or_modes.py
@@ -75,14 +75,14 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
      # Check the correct capabilities for the client ports (if-100GE, if-100GE-ODU4,
      # if-OCH-OTU4-ODU4)
      def test_02_check_client_capabilities(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR3-CLIENT1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR3-CLIENT1")
          self.assertEqual(response["status_code"], requests.codes.ok)
          self.assertEqual(
              self.CLIENT_CAPABILITIES,
              sorted(response["mapping"][0]["supported-interface-capability"]))
  
      def test_03_check_client_capabilities(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-C2", "XPDR3-CLIENT1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-C2", "mapping", "XPDR3-CLIENT1")
          self.assertEqual(response["status_code"], requests.codes.ok)
          self.assertEqual(
              self.CLIENT_CAPABILITIES,
@@ -162,7 +162,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
               for x in response["output"]["node-interface"][1].keys()})
  
      def test_05_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR3-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR3-NETWORK1")
          self.assertEqual(response["status_code"], requests.codes.ok)
          self.NETWORK1_CHECK_DICT["supporting-otucn"] = "XPDR3-NETWORK1-OTUC1"
          self.NETWORK1_CHECK_DICT["lcp-hash-val"] = "FDvaQIf2Z08="
@@ -172,7 +172,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
              response["mapping"])
  
      def test_06_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-C2", "XPDR3-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-C2", "mapping", "XPDR3-NETWORK1")
          self.assertEqual(response["status_code"], requests.codes.ok)
          self.NETWORK1_CHECK_DICT["supporting-otucn"] = "XPDR3-NETWORK1-OTUC1"
          self.NETWORK1_CHECK_DICT["lcp-hash-val"] = "AJpkaVmZKJk5"
@@ -519,11 +519,11 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
  
      # Check if port-mapping data is updated, where the supporting-otucn is deleted
      def test_26_check_no_otuc1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR3-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR3-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-otucn"])
  
      def test_27_check_no_otuc1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-C2", "XPDR3-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-C2", "mapping", "XPDR3-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-otucn"])
  
      def test_28_check_no_interface_otsig(self):
@@ -605,7 +605,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.NETWORK1_CHECK_DICT["lcp-hash-val"] = "LY9PxYJqUbw="
  
      def test_33_get_portmapping_network1(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertEqual(response["status_code"], requests.codes.ok)
          self.NETWORK1_CHECK_DICT["supporting-otucn"] = "XPDR2-NETWORK1-OTUC2"
          del self.NETWORK1_CHECK_DICT["connection-map-lcp"]
@@ -725,7 +725,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
          self.assertEqual(response["status_code"], requests.codes.conflict)
  
      def test_41_check_no_otuc2(self):
-        response = test_utils_rfc8040.portmapping_request("XPDR-A2", "XPDR2-NETWORK1")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "mapping", "XPDR2-NETWORK1")
          self.assertRaises(KeyError, lambda: response["supporting-otucn"])
  
      # Disconnect the XPDR
@@ -742,7 +742,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
                           "Request could not be completed because the relevant data model content does not exist")
  
      def test_44_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-A2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-A2", "node-info", None)
          self.assertEqual(response["status_code"], requests.codes.conflict)
          self.assertIn(response["node-info"]["error-type"], ("protocol", "application"))
          self.assertEqual(response["node-info"]["error-tag"], "data-missing")
@@ -762,7 +762,7 @@ class TransportPCE400GPortMappingTesting(unittest.TestCase):
                           "Request could not be completed because the relevant data model content does not exist")
  
      def test_47_xpdr_device_not_connected(self):
-        response = test_utils_rfc8040.get_portmapping_node_info("XPDR-C2")
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-C2", "node-info", None)
          self.assertEqual(response["status_code"], requests.codes.conflict)
          self.assertIn(response["node-info"]["error-type"], ("protocol", "application"))
          self.assertEqual(response["node-info"]["error-tag"], "data-missing")
diff --git a/tests/transportpce_tests/common/test_utils.py b/tests/transportpce_tests/common/test_utils.py

index 65ca5e212677a6346c605a81175c07d53c2d1b53..4b2b7f1d01c76d2730376038716b17f8aad875b3 100644 (file)
--- a/tests/transportpce_tests/common/test_utils.py
+++ b/tests/transportpce_tests/common/test_utils.py
@@ -69,6 +69,8 @@ URL_TAPI_GET_NOTIFICATION_LIST = "{}/operations/tapi-notification:get-notificati
  TYPE_APPLICATION_JSON = {'Content-Type': 'application/json', 'Accept': 'application/json'}
  TYPE_APPLICATION_XML = {'Content-Type': 'application/xml', 'Accept': 'application/xml'}
  
+REQUEST_TIMEOUT = 10
+
  CODE_SHOULD_BE_200 = 'Http status code should be 200'
  CODE_SHOULD_BE_201 = 'Http status code should be 201'
  
@@ -170,7 +172,8 @@ def get_request(url):
      return requests.request(
          "GET", url.format(RESTCONF_BASE_URL),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def post_request(url, data):
@@ -180,12 +183,14 @@ def post_request(url, data):
              "POST", url.format(RESTCONF_BASE_URL),
              data=json.dumps(data),
              headers=TYPE_APPLICATION_JSON,
-            auth=(ODL_LOGIN, ODL_PWD))
+            auth=(ODL_LOGIN, ODL_PWD),
+            timeout=REQUEST_TIMEOUT)
  
      return requests.request(
          "POST", url.format(RESTCONF_BASE_URL),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def post_xmlrequest(url, data):
@@ -194,7 +199,8 @@ def post_xmlrequest(url, data):
              "POST", url.format(RESTCONF_BASE_URL),
              data=data,
              headers=TYPE_APPLICATION_XML,
-            auth=(ODL_LOGIN, ODL_PWD))
+            auth=(ODL_LOGIN, ODL_PWD),
+            timeout=REQUEST_TIMEOUT)
      return None
  
  
@@ -203,7 +209,8 @@ def put_request(url, data):
          "PUT", url.format(RESTCONF_BASE_URL),
          data=json.dumps(data),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def put_xmlrequest(url, data):
@@ -211,7 +218,8 @@ def put_xmlrequest(url, data):
          "PUT", url.format(RESTCONF_BASE_URL),
          data=data,
          headers=TYPE_APPLICATION_XML,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def put_jsonrequest(url, data):
@@ -219,7 +227,8 @@ def put_jsonrequest(url, data):
          "PUT", url.format(RESTCONF_BASE_URL),
          data=data,
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def rawput_request(url, data):
@@ -227,7 +236,8 @@ def rawput_request(url, data):
          "PUT", url.format(RESTCONF_BASE_URL),
          data=data,
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def rawpost_request(url, data):
@@ -235,14 +245,16 @@ def rawpost_request(url, data):
          "POST", url.format(RESTCONF_BASE_URL),
          data=data,
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def delete_request(url):
      return requests.request(
          "DELETE", url.format(RESTCONF_BASE_URL),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def mount_device(node_id, sim):
diff --git a/tests/transportpce_tests/common/test_utils_rfc8040.py b/tests/transportpce_tests/common/test_utils_rfc8040.py

index e83a284a221260238a92c3cca7afdae5a2efe07f..bcbe35ef467b68da1d6e7a524b2046db5d6228fd 100644 (file)
--- a/tests/transportpce_tests/common/test_utils_rfc8040.py
+++ b/tests/transportpce_tests/common/test_utils_rfc8040.py
@@ -29,8 +29,7 @@ import simulators
  SIMS = simulators.SIMS
  
  HONEYNODE_OK_START_MSG = 'Netconf SSH endpoint started successfully at 0.0.0.0'
-KARAF_OK_START_MSG = re.escape(
-    "Blueprint container for bundle org.opendaylight.netconf.restconf")+".* was successfully created"
+KARAF_OK_START_MSG = "Blueprint container for bundle org.opendaylight.netconf.restconf.* was successfully created"
  LIGHTY_OK_START_MSG = re.escape("lighty.io and RESTCONF-NETCONF started")
  
  ODL_LOGIN = 'admin'
@@ -41,6 +40,8 @@ NODES_PWD = 'admin'
  TYPE_APPLICATION_JSON = {'Content-Type': 'application/json', 'Accept': 'application/json'}
  TYPE_APPLICATION_XML = {'Content-Type': 'application/xml', 'Accept': 'application/xml'}
  
+REQUEST_TIMEOUT = 10
+
  CODE_SHOULD_BE_200 = 'Http status code should be 200'
  CODE_SHOULD_BE_201 = 'Http status code should be 201'
  
@@ -88,7 +89,8 @@ def get_request(url):
      return requests.request(
          'GET', url.format(RESTCONF_BASE_URL),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def put_request(url, data):
@@ -96,28 +98,31 @@ def put_request(url, data):
          'PUT', url.format(RESTCONF_BASE_URL),
          data=json.dumps(data),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def delete_request(url):
      return requests.request(
          'DELETE', url.format(RESTCONF_BASE_URL),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  
  def post_request(url, data):
      if data:
-        print(json.dumps(data))
          return requests.request(
              "POST", url.format(RESTCONF_BASE_URL),
              data=json.dumps(data),
              headers=TYPE_APPLICATION_JSON,
-            auth=(ODL_LOGIN, ODL_PWD))
+            auth=(ODL_LOGIN, ODL_PWD),
+            timeout=REQUEST_TIMEOUT)
      return requests.request(
          "POST", url.format(RESTCONF_BASE_URL),
          headers=TYPE_APPLICATION_JSON,
-        auth=(ODL_LOGIN, ODL_PWD))
+        auth=(ODL_LOGIN, ODL_PWD),
+        timeout=REQUEST_TIMEOUT)
  
  #
  # Process management
@@ -282,7 +287,7 @@ def mount_device(node: str, sim: str):
          'netconf-node-topology:tcp-only': 'false',
          'netconf-node-topology:pass-through': {}}]}
      response = put_request(url[RESTCONF_VERSION].format('{}', node), body)
-    if wait_until_log_contains(TPCE_LOG, re.escape('Triggering notification stream NETCONF for node ' + node), 180):
+    if wait_until_log_contains(TPCE_LOG, 'Triggering notification stream NETCONF for node ' + node, 180):
          print('Node ' + node + ' correctly added to tpce topology', end='... ', flush=True)
      else:
          print('Node ' + node + ' still not added to tpce topology', end='... ', flush=True)
@@ -376,67 +381,43 @@ def del_node_attribute_request(node: str, attribute: str, attribute_value: str):
  #
  
  
-def get_portmapping(node: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:nodes',
-                  'draft-bierman02': 'nodes'}
-    nodes = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'nodes': nodes}
-
-
-def get_portmapping_node_info(node: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/node-info',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/node-info'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:node-info',
-                  'draft-bierman02': 'node-info'}
-    if return_key[RESTCONF_VERSION] in res.keys():
-        node_info = res[return_key[RESTCONF_VERSION]]
-    else:
-        node_info = res['errors']['error'][0]
-    return {'status_code': response.status_code,
-            'node-info': node_info}
-
-
-def portmapping_request(node: str, mapping: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/mapping={}',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/mapping/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, mapping))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:mapping',
-                  'draft-bierman02': 'mapping'}
-    mapping = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'mapping': mapping}
+def post_portmapping(payload: str):
+    url = {'rfc8040': '{}/data/transportpce-portmapping:network',
+           'draft-bierman02': '{}/config/transportpce-portmapping:network'}
+    json_payload = json.loads(payload)
+    response = post_request(url[RESTCONF_VERSION].format('{}'), json_payload)
+    return {'status_code': response.status_code}
  
  
-def portmapping_switching_pool_request(node: str, switching_pool: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/switching-pool-lcp={}',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/switching-pool-lcp/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, switching_pool))
-    res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:switching-pool-lcp',
-                  'draft-bierman02': 'switching-pool-lcp'}
-    switching_pool = res[return_key[RESTCONF_VERSION]]
-    return {'status_code': response.status_code,
-            'switching_pool': switching_pool}
+def del_portmapping():
+    url = {'rfc8040': '{}/data/transportpce-portmapping:network',
+           'draft-bierman02': '{}/config/transportpce-portmapping:network'}
+    response = delete_request(url[RESTCONF_VERSION].format('{}'))
+    return {'status_code': response.status_code}
  
  
-def portmapping_mc_capa_request(node: str, mc_capa: str):
-    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}/mc-capabilities={}',
-           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}/mc-capabilities/{}'}
-    response = get_request(url[RESTCONF_VERSION].format('{}', node, mc_capa))
+def get_portmapping_node_attr(node: str, attr: str, value: str):
+    # pylint: disable=consider-using-f-string
+    url = {'rfc8040': '{}/data/transportpce-portmapping:network/nodes={}',
+           'draft-bierman02': '{}/config/transportpce-portmapping:network/nodes/{}'}
+    target_url = url[RESTCONF_VERSION].format('{}', node)
+    if attr is not None:
+        target_url = (target_url + '/{}').format('{}', attr)
+        if value is not None:
+            suffix = {'rfc8040': '={}', 'draft-bierman02': '/{}'}
+            target_url = (target_url + suffix[RESTCONF_VERSION]).format('{}', value)
+    else:
+        attr = 'nodes'
+    response = get_request(target_url)
      res = response.json()
-    return_key = {'rfc8040': 'transportpce-portmapping:mc-capabilities',
-                  'draft-bierman02': 'mc-capabilities'}
-    capabilities = res[return_key[RESTCONF_VERSION]]
+    return_key = {'rfc8040': 'transportpce-portmapping:' + attr,
+                  'draft-bierman02': attr}
+    if return_key[RESTCONF_VERSION] in res.keys():
+        return_output = res[return_key[RESTCONF_VERSION]]
+    else:
+        return_output = res['errors']['error'][0]
      return {'status_code': response.status_code,
-            'mc-capabilities': capabilities}
+            attr: return_output}
  
  #
  # Topology operations
@@ -453,14 +434,32 @@ def get_ietf_network_request(network: str, content: str):
      else:
          format_args = ('{}', 'operational', network)
      response = get_request(url[RESTCONF_VERSION].format(*format_args))
-    res = response.json()
-    return_key = {'rfc8040': 'ietf-network:network',
-                  'draft-bierman02': 'network'}
-    networks = res[return_key[RESTCONF_VERSION]]
+    if bool(response):
+        res = response.json()
+        return_key = {'rfc8040': 'ietf-network:network',
+                      'draft-bierman02': 'network'}
+        networks = res[return_key[RESTCONF_VERSION]]
+    else:
+        networks = None
      return {'status_code': response.status_code,
              'network': networks}
  
  
+def put_ietf_network(network: str, payload: str):
+    url = {'rfc8040': '{}/data/ietf-network:networks/network={}',
+           'draft-bierman02': '{}/config/ietf-network:networks/network/{}'}
+    json_payload = json.loads(payload)
+    response = put_request(url[RESTCONF_VERSION].format('{}', network), json_payload)
+    return {'status_code': response.status_code}
+
+
+def del_ietf_network(network: str):
+    url = {'rfc8040': '{}/data/ietf-network:networks/network={}',
+           'draft-bierman02': '{}/config/ietf-network:networks/network/{}'}
+    response = delete_request(url[RESTCONF_VERSION].format('{}', network))
+    return {'status_code': response.status_code}
+
+
  def get_ietf_network_link_request(network: str, link: str, content: str):
      url = {'rfc8040': '{}/data/ietf-network:networks/network={}/ietf-network-topology:link={}?content={}',
             'draft-bierman02': '{}/{}/ietf-network:networks/network/{}/ietf-network-topology:link/{}'}
@@ -520,10 +519,13 @@ def get_ietf_network_node_request(network: str, node: str, content: str):
      else:
          format_args = ('{}', 'operational', network, node)
      response = get_request(url[RESTCONF_VERSION].format(*format_args))
-    res = response.json()
-    return_key = {'rfc8040': 'ietf-network:node',
-                  'draft-bierman02': 'node'}
-    node = res[return_key[RESTCONF_VERSION]][0]
+    if bool(response):
+        res = response.json()
+        return_key = {'rfc8040': 'ietf-network:node',
+                      'draft-bierman02': 'node'}
+        node = res[return_key[RESTCONF_VERSION]][0]
+    else:
+        node = None
      return {'status_code': response.status_code,
              'node': node}
  
@@ -580,6 +582,21 @@ def get_ordm_serv_list_attr_request(attribute: str, value: str):
              attribute: response_attribute}
  
  
+def get_serv_path_list_attr(attribute: str, value: str):
+    url = {'rfc8040': '{}/data/transportpce-service-path:service-path-list/{}={}?content=nonconfig',
+           'draft-bierman02': '{}/operational/transportpce-service-path:service-path-list/{}/{}'}
+    response = get_request(url[RESTCONF_VERSION].format('{}', attribute, value))
+    res = response.json()
+    return_key = {'rfc8040': 'transportpce-service-path:' + attribute,
+                  'draft-bierman02': attribute}
+    if return_key[RESTCONF_VERSION] in res.keys():
+        response_attribute = res[return_key[RESTCONF_VERSION]]
+    else:
+        response_attribute = res['errors']['error'][0]
+    return {'status_code': response.status_code,
+            attribute: response_attribute}
+
+
  #
  # TransportPCE internal API RPCs
  #
diff --git a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py

index ef39cb2625d8d3688c72be2c4f07932136ea1a48..489ca60fb325f5aa5243ec7d2d2c3ab4fb206e3a 100644 (file)
--- a/tests/transportpce_tests/hybrid/test01_device_change_notifications.py
+++ b/tests/transportpce_tests/hybrid/test01_device_change_notifications.py
@@ -19,13 +19,13 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEFulltesting(unittest.TestCase):
  
      processes = None
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
          "sdnc-request-header": {
              "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
              "rpc-action": "service-create",
@@ -56,6 +56,16 @@ class TransportPCEFulltesting(unittest.TestCase):
          "due-date": "2016-11-28T00:00:01Z",
          "operator-contact": "pw1234"
      }
+
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
  
      WAITING = 25  # nominal value is 300
@@ -65,71 +75,75 @@ class TransportPCEFulltesting(unittest.TestCase):
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('xpdra', cls.NODE_VERSION_121),
-                                               ('roadma', cls.NODE_VERSION_221),
-                                               ('roadmc', cls.NODE_VERSION_221),
-                                               ('xpdrc', cls.NODE_VERSION_71)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra', cls.NODE_VERSION_121),
+                                                       ('roadma', cls.NODE_VERSION_221),
+                                                       ('roadmc', cls.NODE_VERSION_221),
+                                                       ('xpdrc', cls.NODE_VERSION_71)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
-        time.sleep(10)
+        time.sleep(3)
  
      def setUp(self):  # instruction executed before each test method
          # pylint: disable=consider-using-f-string
          print("execution of {}".format(self.id().split(".")[-1]))
  
      def test_01_connect_xpdrA(self):
-        response = test_utils.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION_121))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDRA01", ('xpdra', self.NODE_VERSION_121))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_02_connect_xpdrC(self):
-        response = test_utils.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION_71))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("XPDR-C1", ('xpdrc', self.NODE_VERSION_71))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_connect_rdmA(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_04_connect_rdmC(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
-        self.assertEqual(response.status_code, requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+        self.assertEqual(response.status_code,
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_05_connect_xprdA_N1_to_roadmA_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDRA01", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_06_connect_roadmA_PP1_to_xpdrA_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDRA01", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDRA01', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_07_connect_xprdC_N1_to_roadmC_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully', res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_08_connect_roadmC_PP1_to_xpdrC_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C1", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully', res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C1', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_09_add_omsAttributes_ROADMA_ROADMC(self):
          # Config ROADMA-ROADMC oms-attributes
@@ -143,7 +157,8 @@ class TransportPCEFulltesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_10_add_omsAttributes_ROADMC_ROADMA(self):
@@ -158,32 +173,29 @@ class TransportPCEFulltesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
  # test service-create for Eth service from xpdr to xpdr
      def test_11_create_eth_service1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_12_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+            "services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_13_change_status_line_port_xpdra(self):
          url = "{}/config/org-openroadm-device:org-openroadm-device/circuit-packs/1%2F0%2F1-PLUG-NET/ports/1"
@@ -195,16 +207,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "outOfService",
              "port-qual": "xpdr-network"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8130/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
      def test_14_check_update_portmapping(self):
-        response = test_utils.portmapping_request("XPDRA01")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        mapping_list = res['nodes'][0]['mapping']
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", None, None)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        mapping_list = response['nodes'][0]['mapping']
          for mapping in mapping_list:
              if mapping['logical-connection-point'] == 'XPDR1-NETWORK1':
                  self.assertEqual(mapping['port-oper-state'], 'OutOfService',
@@ -219,11 +231,9 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_15_check_update_openroadm_topo(self):
-        url = test_utils.URL_CONFIG_ORDM_TOPO
-        response = test_utils.get_request(url)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        node_list = res['network'][0]['node']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        node_list = response['network'][0]['node']
          nb_updated_tp = 0
          for node in node_list:
              self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
@@ -239,7 +249,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                      self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
          self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
  
-        link_list = res['network'][0]['ietf-network-topology:link']
+        link_list = response['network'][0]['ietf-network-topology:link']
          updated_links = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX',
                           'ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
          nb_updated_link = 0
@@ -255,11 +265,10 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_16_check_update_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['services'][0]['operational-state'], 'outOfService')
-        self.assertEqual(res['services'][0]['administrative-state'], 'inService')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['operational-state'], 'outOfService')
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
          time.sleep(1)
  
      def test_17_restore_status_line_port_xpdra(self):
@@ -272,16 +281,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "inService",
              "port-qual": "xpdr-network"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8130/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
      def test_18_check_update_portmapping_ok(self):
-        response = test_utils.portmapping_request("XPDRA01")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        mapping_list = res['nodes'][0]['mapping']
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDRA01", None, None)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        mapping_list = response['nodes'][0]['mapping']
          for mapping in mapping_list:
              self.assertEqual(mapping['port-oper-state'], 'InService',
                               "Operational State should be 'InService'")
@@ -290,11 +299,9 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_19_check_update_openroadm_topo_ok(self):
-        url = test_utils.URL_CONFIG_ORDM_TOPO
-        response = test_utils.get_request(url)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        node_list = res['network'][0]['node']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        node_list = response['network'][0]['node']
          for node in node_list:
              self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
              self.assertEqual(node['org-openroadm-common-network:administrative-state'], 'inService')
@@ -303,7 +310,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                  self.assertEqual(tp['org-openroadm-common-network:operational-state'], 'inService')
                  self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
  
-        link_list = res['network'][0]['ietf-network-topology:link']
+        link_list = response['network'][0]['ietf-network-topology:link']
          for link in link_list:
              self.assertEqual(link['org-openroadm-common-network:operational-state'], 'inService')
              self.assertEqual(link['org-openroadm-common-network:administrative-state'], 'inService')
@@ -322,16 +329,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "outOfService",
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
      def test_22_check_update_portmapping(self):
-        response = test_utils.portmapping_request("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        mapping_list = res['nodes'][0]['mapping']
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        mapping_list = response['nodes'][0]['mapping']
          for mapping in mapping_list:
              if mapping['logical-connection-point'] == 'SRG1-PP1-TXRX':
                  self.assertEqual(mapping['port-oper-state'], 'OutOfService',
@@ -346,11 +353,9 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_23_check_update_openroadm_topo(self):
-        url = test_utils.URL_CONFIG_ORDM_TOPO
-        response = test_utils.get_request(url)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        node_list = res['network'][0]['node']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        node_list = response['network'][0]['node']
          nb_updated_tp = 0
          for node in node_list:
              self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
@@ -366,7 +371,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                      self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
          self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
  
-        link_list = res['network'][0]['ietf-network-topology:link']
+        link_list = response['network'][0]['ietf-network-topology:link']
          updated_links = ['XPDRA01-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX',
                           'ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1']
          nb_updated_link = 0
@@ -391,8 +396,9 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "inService",
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -415,16 +421,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "outOfService",
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
      def test_29_check_update_portmapping(self):
-        response = test_utils.portmapping_request("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        mapping_list = res['nodes'][0]['mapping']
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        mapping_list = response['nodes'][0]['mapping']
          for mapping in mapping_list:
              if mapping['logical-connection-point'] == 'DEG2-TTP-TXRX':
                  self.assertEqual(mapping['port-oper-state'], 'OutOfService',
@@ -439,11 +445,9 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_30_check_update_openroadm_topo(self):
-        url = test_utils.URL_CONFIG_ORDM_TOPO
-        response = test_utils.get_request(url)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        node_list = res['network'][0]['node']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        node_list = response['network'][0]['node']
          nb_updated_tp = 0
          for node in node_list:
              self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
@@ -459,7 +463,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                      self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
          self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
  
-        link_list = res['network'][0]['ietf-network-topology:link']
+        link_list = response['network'][0]['ietf-network-topology:link']
          updated_links = ['ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX',
                           'ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX']
          nb_updated_link = 0
@@ -484,8 +488,9 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "inService",
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -506,16 +511,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "outOfService",
              "port-qual": "xpdr-network"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8154/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
      def test_36_check_update_portmapping(self):
-        response = test_utils.portmapping_request("XPDR-C1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        mapping_list = res['nodes'][0]['mapping']
+        response = test_utils_rfc8040.get_portmapping_node_attr("XPDR-C1", None, None)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        mapping_list = response['nodes'][0]['mapping']
          for mapping in mapping_list:
              if mapping['logical-connection-point'] == 'XPDR1-NETWORK1':
                  self.assertEqual(mapping['port-oper-state'], 'OutOfService',
@@ -530,11 +535,9 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_37_check_update_openroadm_topo(self):
-        url = test_utils.URL_CONFIG_ORDM_TOPO
-        response = test_utils.get_request(url)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        node_list = res['network'][0]['node']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        node_list = response['network'][0]['node']
          nb_updated_tp = 0
          for node in node_list:
              self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
@@ -550,7 +553,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                      self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
          self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
  
-        link_list = res['network'][0]['ietf-network-topology:link']
+        link_list = response['network'][0]['ietf-network-topology:link']
          updated_links = ['XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX',
                           'ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1']
          nb_updated_link = 0
@@ -573,8 +576,9 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "inService",
              "port-qual": "xpdr-network"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8154/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -597,16 +601,16 @@ class TransportPCEFulltesting(unittest.TestCase):
              "administrative-state": "outOfService",
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
      def test_43_check_update_portmapping(self):
-        response = test_utils.portmapping_request("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        mapping_list = res['nodes'][0]['mapping']
+        response = test_utils_rfc8040.get_portmapping_node_attr("ROADM-A1", None, None)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        mapping_list = response['nodes'][0]['mapping']
          for mapping in mapping_list:
              if mapping['logical-connection-point'] == 'SRG1-PP2-TXRX':
                  self.assertEqual(mapping['port-oper-state'], 'OutOfService',
@@ -621,11 +625,9 @@ class TransportPCEFulltesting(unittest.TestCase):
          time.sleep(1)
  
      def test_44_check_update_openroadm_topo(self):
-        url = test_utils.URL_CONFIG_ORDM_TOPO
-        response = test_utils.get_request(url)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        node_list = res['network'][0]['node']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        node_list = response['network'][0]['node']
          nb_updated_tp = 0
          for node in node_list:
              self.assertEqual(node['org-openroadm-common-network:operational-state'], 'inService')
@@ -641,7 +643,7 @@ class TransportPCEFulltesting(unittest.TestCase):
                      self.assertEqual(tp['org-openroadm-common-network:administrative-state'], 'inService')
          self.assertEqual(nb_updated_tp, 1, "Only one termination-point should have been modified")
  
-        link_list = res['network'][0]['ietf-network-topology:link']
+        link_list = response['network'][0]['ietf-network-topology:link']
          nb_updated_link = 0
          for link in link_list:
              self.assertEqual(link['org-openroadm-common-network:operational-state'], 'inService')
@@ -653,40 +655,40 @@ class TransportPCEFulltesting(unittest.TestCase):
          self.test_12_get_eth_service1()
  
      def test_46_delete_eth_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_47_disconnect_xponders_from_roadm(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
              if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
-                link_name = link["link-id"]
-                response = test_utils.delete_request(url+link_name)
-                self.assertEqual(response.status_code, requests.codes.ok)
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_48_disconnect_XPDRA(self):
-        response = test_utils.unmount_device("XPDRA01")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDRA01")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_49_disconnect_XPDRC(self):
-        response = test_utils.unmount_device("XPDR-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_50_disconnect_ROADMA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_51_disconnect_ROADMC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok, test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py

index 2bd319118ee204569bec52104d6bfc11a5c752f9..2bb2cea3c16ddb7451959c7d2ac5fec0174b6be9 100644 (file)
--- a/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
+++ b/tests/transportpce_tests/hybrid/test02_B100G_end2end.py
@@ -23,7 +23,7 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEtesting(unittest.TestCase):
@@ -33,7 +33,7 @@ class TransportPCEtesting(unittest.TestCase):
      NODE_VERSION_221 = '2.2.1'
      NODE_VERSION_71 = '7.1'
  
-    cr_serv_sample_data = {"input": {
+    cr_serv_input_data = {
          "sdnc-request-header": {
              "request-id": "request-1",
              "rpc-action": "service-create",
@@ -125,81 +125,87 @@ class TransportPCEtesting(unittest.TestCase):
          "due-date": "2018-06-15T00:00:01Z",
          "operator-contact": "pw1234"
      }
+
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('xpdra2', cls.NODE_VERSION_71),
-                                               ('roadma', cls.NODE_VERSION_221),
-                                               ('roadmc', cls.NODE_VERSION_221),
-                                               ('xpdrc2', cls.NODE_VERSION_71)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra2', cls.NODE_VERSION_71),
+                                                       ('roadma', cls.NODE_VERSION_221),
+                                                       ('roadmc', cls.NODE_VERSION_221),
+                                                       ('xpdrc2', cls.NODE_VERSION_71)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):
-        time.sleep(2)
+        time.sleep(1)
  
      def test_01_connect_xpdra2(self):
-        response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
+        response = test_utils_rfc8040.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_02_connect_xpdrc2(self):
-        response = test_utils.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
+        response = test_utils_rfc8040.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_connect_rdma(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_04_connect_rdmc(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_05_connect_xprda2_2_N1_to_roadma_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "2", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_06_connect_roadma_PP2_to_xpdra2_2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "2", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_07_connect_xprdc2_2_N1_to_roadmc_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "2", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_08_connect_roadmc_PP2_to_xpdrc2_2_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "2", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '2', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_09_add_omsAttributes_roadma_roadmc(self):
          # Config ROADMA-ROADMC oms-attributes
@@ -213,7 +219,7 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
+        response = test_utils_rfc8040.add_oms_attr_request(
              "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
@@ -229,76 +235,63 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request(
+        response = test_utils_rfc8040.add_oms_attr_request(
              "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
-# test service-create for OCH-OTU4 service from xpdra2 to xpdrc2
+    # test service-create for OCH-OTU4 service from xpdra2 to xpdrc2
      def test_11_check_otn_topology(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nbNode = len(res['network'][0]['node'])
-        self.assertEqual(nbNode, 6, 'There should be 6 nodes')
-        self.assertNotIn('ietf-network-topology:link', res['network'][0])
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['node']), 6, 'There should be 6 nodes')
+        self.assertNotIn('ietf-network-topology:link', response['network'][0])
  
      def test_12_create_OTUC4_service(self):
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_13_get_OTUC4_service1(self):
-        response = test_utils.get_service_list_request(
-            "services/service1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1-OTUC4')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        self.assertEqual(
-            res['services'][0]['service-layer'], 'wdm')
-        self.assertEqual(
-            res['services'][0]['service-a-end']['service-rate'], 400)
-        self.assertEqual(
-            res['services'][0]['service-a-end']['otu-service-rate'], 'org-openroadm-otn-common-types:OTUCn')
-        time.sleep(2)
-        self.assertEqual(
-            res['services'][0]['service-z-end']['otu-service-rate'], 'org-openroadm-otn-common-types:OTUCn')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+            "services", "service1-OTUC4")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1-OTUC4')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        self.assertEqual(response['services'][0]['service-layer'], 'wdm')
+        self.assertEqual(response['services'][0]['service-a-end']['service-rate'], 400)
+        self.assertEqual(response['services'][0]['service-a-end']['otu-service-rate'],
+                         'org-openroadm-otn-common-types:OTUCn')
+        self.assertEqual(response['services'][0]['service-z-end']['otu-service-rate'],
+                         'org-openroadm-otn-common-types:OTUCn')
  
      # Check correct configuration of devices
      def test_14_check_interface_otsi_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-755:768')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-755:768',
                                     'administrative-state': 'inService',
                                     'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
                                     'type': 'org-openroadm-interfaces:otsi',
                                     'supporting-port': 'L1'
-                                   }, **res['interface'][0]),
-                             res['interface'][0])
-
+                                   }, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(
              dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi',
                    'transmit-power': -5, 'modulation-format': 'dp-qam16'},
-                 **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
-            res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
+                 **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
+            response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
  
      def test_15_check_interface_OTSI_GROUP_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -309,18 +302,17 @@ class TransportPCEtesting(unittest.TestCase):
          input_dict_2 = {"group-id": 1,
                          "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]
                                    ['org-openroadm-otsi-group-interfaces:otsi-group']),
-                             res['interface'][0]
+                             response['interface'][0]
                               ['org-openroadm-otsi-group-interfaces:otsi-group'])
  
      def test_16_check_interface_OTUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTUC4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTUC4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -337,36 +329,34 @@ class TransportPCEtesting(unittest.TestCase):
                          'degm-intervals': 2,
                          'otucn-n-rate': 4
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
-                             res['interface'][0]
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]
                               ['org-openroadm-otn-otu-interfaces:otu'])
  
      def test_17_check_interface_otsi_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-NETWORK1-755:768')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertDictEqual(dict({'name': 'XPDR2-NETWORK1-755:768',
                                     'administrative-state': 'inService',
                                     'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
                                     'type': 'org-openroadm-interfaces:otsi',
                                     'supporting-port': 'L1'
-                                   }, **res['interface'][0]),
-                             res['interface'][0])
+                                   }, **response['interface'][0]),
+                             response['interface'][0])
  
          self.assertDictEqual(
              dict({'frequency': 196.0812, 'otsi-rate': 'org-openroadm-common-optical-channel-types:R400G-otsi',
                    'transmit-power': -5, 'modulation-format': 'dp-qam16'},
-                 **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
-            res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
+                 **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
+            response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
  
      def test_18_check_interface_OTSI_GROUP_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-OTSIGROUP-400G',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -377,18 +367,17 @@ class TransportPCEtesting(unittest.TestCase):
          input_dict_2 = {"group-id": 1,
                          "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]
                                    ['org-openroadm-otsi-group-interfaces:otsi-group']),
-                             res['interface'][0]
+                             response['interface'][0]
                               ['org-openroadm-otsi-group-interfaces:otsi-group'])
  
      def test_19_check_interface_OTUC4_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-NETWORK1-OTUC4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -406,100 +395,80 @@ class TransportPCEtesting(unittest.TestCase):
                          'otucn-n-rate': 4
                          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
  
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
-                             res['interface'][0]
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]
                               ['org-openroadm-otn-otu-interfaces:otu'])
  
      def test_20_check_no_interface_ODUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_21_check_openroadm_topo_xpdra2(self):
-        response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        ele = res['node'][0]['ietf-network-topology:termination-point'][0]
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        ele = response['node']['ietf-network-topology:termination-point'][0]
          self.assertEqual('XPDR2-NETWORK1', ele['tp-id'])
-        self.assertEqual({'frequency': 196.08125,
-                          'width': 75},
-                         ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
-        time.sleep(3)
+        self.assertEqual(
+            196.08125,
+            float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+        self.assertEqual(
+            75.0,
+            float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
  
      def test_22_check_otn_topo_OTUC4_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 2)
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 2)
          listLinkId = ['OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
                        'OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1']
-        for link in res['network'][0]['ietf-network-topology:link']:
+        for link in response['network'][0]['ietf-network-topology:link']:
              self.assertIn(link['link-id'], listLinkId)
-            self.assertEqual(
-                link['transportpce-networkutils:otn-link-type'], 'OTUC4')
-            self.assertEqual(
-                link['org-openroadm-common-network:link-type'], 'OTN-LINK')
-            self.assertEqual(
-                link['org-openroadm-otn-network-topology:available-bandwidth'], 400000)
-            self.assertEqual(
-                link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
-            self.assertIn(
-                link['org-openroadm-common-network:opposite-link'], listLinkId)
-
-# test service-create for ODU4 service from xpdra2 to xpdrc2
+            self.assertEqual(link['transportpce-networkutils:otn-link-type'], 'OTUC4')
+            self.assertEqual(link['org-openroadm-common-network:link-type'], 'OTN-LINK')
+            self.assertEqual(link['org-openroadm-otn-network-topology:available-bandwidth'], 400000)
+            self.assertEqual(link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
+            self.assertIn(link['org-openroadm-common-network:opposite-link'], listLinkId)
+
+    # test service-create for ODU4 service from xpdra2 to xpdrc2
      def test_23_create_ODUC4_service(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1-ODUC4"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "ODU"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "ODU"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["otu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn"
-
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service1-ODUC4"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "ODU"
+        del self.cr_serv_input_data["service-a-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "ODU"
+        del self.cr_serv_input_data["service-z-end"]["otu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["odu-service-rate"] = "org-openroadm-otn-common-types:ODUCn"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_24_get_ODUC4_service1(self):
-        response = test_utils.get_service_list_request(
-            "services/service1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1-ODUC4')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'infrastructure')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        self.assertEqual(
-            res['services'][0]['service-layer'], 'wdm')
-        self.assertEqual(
-            res['services'][0]['service-a-end']['service-rate'], 400)
-        self.assertEqual(
-            res['services'][0]['service-a-end']['odu-service-rate'], 'org-openroadm-otn-common-types:ODUCn')
-        self.assertEqual(
-            res['services'][0]['service-z-end']['odu-service-rate'], 'org-openroadm-otn-common-types:ODUCn')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+            "services", "service1-ODUC4")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['service-name'], 'service1-ODUC4')
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['connection-type'], 'infrastructure')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        self.assertEqual(response['services'][0]['service-layer'], 'wdm')
+        self.assertEqual(response['services'][0]['service-a-end']['service-rate'], 400)
+        self.assertEqual(response['services'][0]['service-a-end']['odu-service-rate'],
+                         'org-openroadm-otn-common-types:ODUCn')
+        self.assertEqual(response['services'][0]['service-z-end']['odu-service-rate'],
+                         'org-openroadm-otn-common-types:ODUCn')
  
      def test_25_check_interface_ODUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -514,19 +483,18 @@ class TransportPCEtesting(unittest.TestCase):
                          'tx-dapi': 'Nmbu2MNHvc4=',
                          'tx-sapi': 'LY9PxYJqUbw='}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(
              {'payload-type': '22', 'exp-payload-type': '22'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
  
      def test_26_check_interface_ODUC4_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODUC4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -541,21 +509,19 @@ class TransportPCEtesting(unittest.TestCase):
                          'expected-sapi': 'LY9PxYJqUbw=',
                          'expected-dapi': 'LY9PxYJqUbw='
                          }
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(dict(input_dict_2, **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(
              {'payload-type': '22', 'exp-payload-type': '22'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
  
      def test_27_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('OTUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
                             'OTUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
@@ -580,9 +546,9 @@ class TransportPCEtesting(unittest.TestCase):
                  self.fail("this link should not exist")
  
      def test_28_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -594,47 +560,41 @@ class TransportPCEtesting(unittest.TestCase):
                          self.assertEqual(xpdrTpPortConAt['odtu-tpn-pool'][0]['odtu-type'],
                                           'org-openroadm-otn-common-types:ODTU4.ts-Allocated')
  
-# test service-create for 100GE service 1 from xpdra2 to xpdrc2
+    # test service-create for 100GE service 1 from xpdra2 to xpdrc2
      def test_29_create_100GE_service_1(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service-100GE"
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["odu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
-        del self.cr_serv_sample_data["input"]["service-z-end"]["odu-service-rate"]
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-100GE"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_input_data["service-a-end"]["odu-service-rate"]
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+        del self.cr_serv_input_data["service-z-end"]["odu-service-rate"]
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_30_get_100GE_service_1(self):
-        response = test_utils.get_service_list_request(
-            "services/service-100GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-100GE')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request(
+            "services", "service-100GE")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-100GE')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
  
      def test_31_check_interface_100GE_CLIENT_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
@@ -642,16 +602,16 @@ class TransportPCEtesting(unittest.TestCase):
                          'supporting-port': 'C1'
                          }
          input_dict_2 = {'speed': 100000}
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
-                             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(
+            dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+            response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
  
      def test_32_check_interface_ODU4_CLIENT_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
@@ -663,20 +623,19 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'terminated'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(
              {'payload-type': '07', 'exp-payload-type': '07'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
  
      def test_33_check_interface_ODU4_NETWORK_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -689,44 +648,41 @@ class TransportPCEtesting(unittest.TestCase):
              'monitoring-mode': 'not-terminated'}
          input_dict_3 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
                                        'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
-        self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
  
      def test_34_check_ODU4_connection_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2",
-            "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_35_check_interface_100GE_CLIENT_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-CLIENT1-ETHERNET-100G',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
@@ -734,16 +690,16 @@ class TransportPCEtesting(unittest.TestCase):
                          'supporting-port': 'C1'
                          }
          input_dict_2 = {'speed': 100000}
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
-                             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(
+            dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+            response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
  
      def test_36_check_interface_ODU4_CLIENT_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-CLIENT1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/1/1-PLUG-CLIENT',
@@ -755,20 +711,19 @@ class TransportPCEtesting(unittest.TestCase):
              'rate': 'org-openroadm-otn-common-types:ODU4',
              'monitoring-mode': 'terminated'}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(
              {'payload-type': '07', 'exp-payload-type': '07'},
-            res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+            response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
  
      def test_37_check_interface_ODU4_NETWORK_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR2-NETWORK1-ODU4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/2/2-PLUG-NET',
@@ -782,51 +737,47 @@ class TransportPCEtesting(unittest.TestCase):
  
          input_dict_3 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
                                        'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
              'parent-odu-allocation'])
          self.assertIn('1.1',
-                      res['interface'][0][
+                      response['interface'][0][
                            'org-openroadm-otn-odu-interfaces:odu'][
                            'parent-odu-allocation']['opucn-trib-slots'])
          self.assertIn('1.20',
-                      res['interface'][0][
+                      response['interface'][0][
                            'org-openroadm-otn-odu-interfaces:odu'][
                            'parent-odu-allocation']['opucn-trib-slots'])
  
      def test_38_check_ODU4_connection_xpdrc2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-C2",
-            "odu-connection/XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-C2', 'odu-connection', 'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {
              'connection-name':
              'XPDR2-CLIENT1-ODU4-x-XPDR2-NETWORK1-ODU4',
              'direction': 'bidirectional'
          }
  
-        self.assertDictEqual(dict(input_dict_1, **res['odu-connection'][0]),
-                             res['odu-connection'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['odu-connection'][0]),
+                             response['odu-connection'][0])
          self.assertDictEqual({'dst-if': 'XPDR2-NETWORK1-ODU4'},
-                             res['odu-connection'][0]['destination'])
+                             response['odu-connection'][0]['destination'])
          self.assertDictEqual({'src-if': 'XPDR2-CLIENT1-ODU4'},
-                             res['odu-connection'][0]['source'])
+                             response['odu-connection'][0]['source'])
  
      def test_39_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
                             'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
@@ -836,9 +787,9 @@ class TransportPCEtesting(unittest.TestCase):
                      link['org-openroadm-otn-network-topology:used-bandwidth'], 100000)
  
      def test_40_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -853,54 +804,45 @@ class TransportPCEtesting(unittest.TestCase):
                          self.assertNotIn(
                              1, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
  
-# test service-create for 100GE service 2 from xpdra2 to xpdrc2
+    # test service-create for 100GE service 2 from xpdra2 to xpdrc2
      def test_41_create_100GE_service_2(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service-100GE2"
-        self.cr_serv_sample_data["input"]["connection-type"] = "service"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "100"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-format"] = "Ethernet"
-        self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
-        self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-100GE2"
+        self.cr_serv_input_data["connection-type"] = "service"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-a-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+        self.cr_serv_input_data["service-z-end"]["service-rate"] = "100"
+        self.cr_serv_input_data["service-z-end"]["service-format"] = "Ethernet"
+        self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+        self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR2-CLIENT2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_42_get_100GE_service_2(self):
-        response = test_utils.get_service_list_request(
-            "services/service-100GE2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-100GE2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-100GE2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-100GE2')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_43_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 4)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 4)
  
      def test_44_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
                             'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
@@ -910,9 +852,9 @@ class TransportPCEtesting(unittest.TestCase):
                      link['org-openroadm-otn-network-topology:used-bandwidth'], 200000)
  
      def test_45_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -928,57 +870,55 @@ class TransportPCEtesting(unittest.TestCase):
                              2, xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool'])
  
      def test_46_delete_100GE_service_2(self):
-        response = test_utils.service_delete_request("service-100GE2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_47_delete_100GE_service_1(self):
-        response = test_utils.service_delete_request("service-100GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-100GE"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_48_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 2)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 2)
  
      def test_49_check_no_ODU4_connection_xpdra2(self):
-        response = test_utils.check_netconf_node_request("XPDR-A2", "")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn(['odu-connection'][0], res['org-openroadm-device'])
-        time.sleep(1)
+        response = test_utils_rfc8040.check_node_request("XPDR-A2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn(['odu-connection'][0], response['org-openroadm-device'])
  
      def test_50_check_no_interface_ODU4_NETWORK_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_51_check_no_interface_ODU4_CLIENT_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-CLIENT1-ODU4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ODU4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_52_check_no_interface_100GE_CLIENT_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-CLIENT1-ETHERNET-100G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-CLIENT1-ETHERNET-100G')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_53_check_otn_topo_links(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        nb_links = len(res['network'][0]['ietf-network-topology:link'])
-        self.assertEqual(nb_links, 4)
-        for link in res['network'][0]['ietf-network-topology:link']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['network'][0]['ietf-network-topology:link']), 4)
+        for link in response['network'][0]['ietf-network-topology:link']:
              linkId = link['link-id']
              if (linkId in ('ODUC4-XPDR-A2-XPDR2-XPDR2-NETWORK1toXPDR-C2-XPDR2-XPDR2-NETWORK1',
                             'ODUC4-XPDR-C2-XPDR2-XPDR2-NETWORK1toXPDR-A2-XPDR2-XPDR2-NETWORK1')):
@@ -988,9 +928,9 @@ class TransportPCEtesting(unittest.TestCase):
                      link['org-openroadm-otn-network-topology:used-bandwidth'], 0)
  
      def test_54_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -1001,32 +941,32 @@ class TransportPCEtesting(unittest.TestCase):
                              len(xpdrTpPortConAt['odtu-tpn-pool'][0]['tpn-pool']), 4)
  
      def test_55_delete_ODUC4_service(self):
-        response = test_utils.service_delete_request("service1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-ODUC4"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_56_check_service_list(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(len(res['service-list']['services']), 1)
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(len(response['service-list']['services']), 1)
  
      def test_57_check_no_interface_ODU4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-ODUC4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_58_check_otn_topo_links(self):
          self.test_22_check_otn_topo_OTUC4_links()
  
      def test_59_check_otn_topo_tp(self):
-        response = test_utils.get_otn_topo_request()
-        res = response.json()
-        for node in res['network'][0]['node']:
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        for node in response['network'][0]['node']:
              if node['node-id'] in ('XPDR-A2-XPDR2', 'XPDR-C2-XPDR2'):
                  tpList = node['ietf-network-topology:termination-point']
                  for tp in tpList:
@@ -1035,182 +975,170 @@ class TransportPCEtesting(unittest.TestCase):
                                           dict.keys(tp))
  
      def test_60_delete_OTUC4_service(self):
-        response = test_utils.service_delete_request("service1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1-OTUC4"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_61_get_no_service(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
-        time.sleep(1)
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['service-list'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
  
      def test_62_check_no_interface_OTUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTUC4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_63_check_no_interface_OTSI_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-755:768')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_64_check_no_interface_OTSIG_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR2-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR2-NETWORK1-OTSIGROUP-400G')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_65_getLinks_OtnTopology(self):
-        response = test_utils.get_otn_topo_request()
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertNotIn('ietf-network-topology:link', res['network'][0])
+        response = test_utils_rfc8040.get_ietf_network_request('otn-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertNotIn('ietf-network-topology:link', response['network'][0])
  
      def test_66_check_openroadm_topo_xpdra2(self):
-        response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        tp = res['node'][0]['ietf-network-topology:termination-point'][0]
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        tp = response['node']['ietf-network-topology:termination-point'][0]
          self.assertEqual('XPDR2-NETWORK1', tp['tp-id'])
          self.assertNotIn('wavelength', dict.keys(
              tp['org-openroadm-network-topology:xpdr-network-attributes']))
-        time.sleep(3)
  
      def test_67_check_openroadm_topology(self):
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          self.assertEqual(22, len(links), 'Topology should contain 22 links')
  
      def test_68_connect_xprda2_1_N1_to_roadma_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_69_connect_roadma_PP2_to_xpdra2_1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_70_connect_xprdc2_1_N1_to_roadmc_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Xponder Roadm Link created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_71_connect_roadmc_PP2_to_xpdrc2_1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Roadm Xponder links created successfully',
-                      res["output"]["result"])
-        time.sleep(2)
-
-
-# test service-create for 400GE service from xpdra2 to xpdrc2
-
-
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
+
+    # test service-create for 400GE service from xpdra2 to xpdrc2
      def test_72_create_400GE_service(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service-400GE"
-        self.cr_serv_sample_data["input"]["service-a-end"]["service-rate"] = "400"
-        self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
-        self.cr_serv_sample_data["input"]["service-z-end"]["service-rate"] = "400"
-        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-a-end"]["tx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-a-end"]["rx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["tx-direction"][0]["port"]["port-device-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-name"]
-        del self.cr_serv_sample_data["input"]["service-z-end"]["rx-direction"][0]["port"]["port-device-name"]
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.cr_serv_input_data["service-name"] = "service-400GE"
+        self.cr_serv_input_data["service-a-end"]["service-rate"] = "400"
+        self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"] = "XPDR1-CLIENT1"
+        self.cr_serv_input_data["service-z-end"]["service-rate"] = "400"
+        del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-a-end"]["tx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-a-end"]["rx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-z-end"]["tx-direction"][0]["port"]["port-device-name"]
+        del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-name"]
+        del self.cr_serv_input_data["service-z-end"]["rx-direction"][0]["port"]["port-device-name"]
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        time.sleep(self.WAITING)
          self.assertIn('PCE calculation in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_73_get_400GE_service(self):
-        response = test_utils.get_service_list_request(
-            "services/service-400GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service-400GE')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service-400GE")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service-400GE')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        time.sleep(1)
  
      def test_74_check_xc1_roadma(self):
-        response = test_utils.check_netconf_node_request(
-            "ROADM-A1", "roadm-connections/SRG1-PP1-TXRX-DEG2-TTP-TXRX-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        # the following statement replaces self.assertDictContainsSubset deprecated in python 3.2
+        response = test_utils_rfc8040.check_node_attribute_request(
+            "ROADM-A1", "roadm-connections", "SRG1-PP1-TXRX-DEG2-TTP-TXRX-755:768")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertDictEqual(
              dict({
                  'connection-name': 'SRG1-PP1-TXRX-DEG2-TTP-TXRX-761:768',
                  'opticalControlMode': 'gainLoss',
                  'target-output-power': -3.0
-            }, **res['roadm-connections'][0]),
-            res['roadm-connections'][0]
-        )
-        self.assertDictEqual(
-            {'src-if': 'SRG1-PP1-TXRX-nmc-755:768'},
-            res['roadm-connections'][0]['source'])
-        self.assertDictEqual(
-            {'dst-if': 'DEG2-TTP-TXRX-nmc-755:768'},
-            res['roadm-connections'][0]['destination'])
-        time.sleep(5)
+            }, **response['roadm-connections'][0]), response['roadm-connections'][0])
+        self.assertDictEqual({'src-if': 'SRG1-PP1-TXRX-nmc-755:768'}, response['roadm-connections'][0]['source'])
+        self.assertDictEqual({'dst-if': 'DEG2-TTP-TXRX-nmc-755:768'}, response['roadm-connections'][0]['destination'])
+        time.sleep(1)
  
      def test_75_check_topo_xpdra2(self):
-        response = test_utils.get_ordm_topo_request("node/XPDR-A2-XPDR1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPDR-A2-XPDR1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'XPDR1-NETWORK1':
-                self.assertEqual({'frequency': 196.08125,
-                                  'width': 75},
-                                 ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength'])
+                self.assertEqual(
+                    196.08125,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['frequency']))
+                self.assertEqual(
+                    75.0,
+                    float(ele['org-openroadm-network-topology:xpdr-network-attributes']['wavelength']['width']))
              if ele['tp-id'] == 'XPDR1-CLIENT1':
                  self.assertNotIn('org-openroadm-network-topology:xpdr-client-attributes', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_76_check_topo_roadma_SRG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:srg-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'SRG1-PP1-TXRX':
                  freq_map = base64.b64decode(
@@ -1219,17 +1147,16 @@ class TransportPCEtesting(unittest.TestCase):
                  self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
              if ele['tp-id'] == 'SRG1-PP2-TXRX':
                  self.assertNotIn('avail-freq-maps', dict.keys(ele))
-        time.sleep(3)
+        time.sleep(1)
  
      def test_77_check_topo_roadma_DEG1(self):
-        response = test_utils.get_ordm_topo_request("node/ROADM-A1-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADM-A1-DEG2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          freq_map = base64.b64decode(
-            res['node'][0]['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
+            response['node']['org-openroadm-network-topology:degree-attributes']['avail-freq-maps'][0]['freq-map'])
          freq_map_array = [int(x) for x in freq_map]
          self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-        liste_tp = res['node'][0]['ietf-network-topology:termination-point']
+        liste_tp = response['node']['ietf-network-topology:termination-point']
          for ele in liste_tp:
              if ele['tp-id'] == 'DEG2-CTP-TXRX':
                  freq_map = base64.b64decode(
@@ -1241,13 +1168,12 @@ class TransportPCEtesting(unittest.TestCase):
                      ele['org-openroadm-network-topology:tx-ttp-attributes']['avail-freq-maps'][0]['freq-map'])
                  freq_map_array = [int(x) for x in freq_map]
                  self.assertEqual(freq_map_array[95], 0, "Index 1 should not be available")
-        time.sleep(3)
+        time.sleep(1)
  
      def test_78_check_interface_400GE_CLIENT_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-CLIENT1-ETHERNET')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-CLIENT1-ETHERNET',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/1/1-PLUG-CLIENT',
@@ -1255,16 +1181,16 @@ class TransportPCEtesting(unittest.TestCase):
                          'supporting-port': 'C1'
                          }
          input_dict_2 = {'speed': 400000}
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2, **res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
-                             res['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(
+            dict(input_dict_2, **response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet']),
+            response['interface'][0]['org-openroadm-ethernet-interfaces:ethernet'])
  
      def test_79_check_interface_OTSI_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-755:768')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-755:768',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
@@ -1278,19 +1204,19 @@ class TransportPCEtesting(unittest.TestCase):
              "provision-mode": "explicit",
              "modulation-format": "dp-qam16"}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
-        self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
-        self.assertDictEqual({"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]},
-                             res['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
+        self.assertDictEqual(
+            dict(input_dict_2, **response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']),
+            response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi'])
+        self.assertDictEqual(
+            {"foic-type": "org-openroadm-common-optical-channel-types:foic4.8", "iid": [1, 2, 3, 4]},
+            response['interface'][0]['org-openroadm-optical-tributary-signal-interfaces:otsi']['flexo'])
  
      def test_80_check_interface_OTSI_GROUP_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTSIGROUP-400G')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-OTSIGROUP-400G',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
@@ -1300,17 +1226,16 @@ class TransportPCEtesting(unittest.TestCase):
          input_dict_2 = {"group-id": 1,
                          "group-rate": "org-openroadm-common-optical-channel-types:R400G-otsi"}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
-                             res['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
+                                  **response['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group']),
+                             response['interface'][0]['org-openroadm-otsi-group-interfaces:otsi-group'])
  
      def test_81_check_interface_OTUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTUC4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-OTUC4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
@@ -1327,17 +1252,16 @@ class TransportPCEtesting(unittest.TestCase):
                          "otucn-n-rate": 4,
                          "degm-intervals": 2}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
-                             res['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
+                                  **response['interface'][0]['org-openroadm-otn-otu-interfaces:otu']),
+                             response['interface'][0]['org-openroadm-otn-otu-interfaces:otu'])
  
      def test_82_check_interface_ODUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUC4')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODUC4',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
@@ -1355,21 +1279,20 @@ class TransportPCEtesting(unittest.TestCase):
                          "oducn-n-rate": 4}
          input_dict_3 = {"exp-payload-type": "22", "payload-type": "22"}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
-        self.assertEqual('XPDR1-NETWORK1-OTUC4', res['interface'][0]['supporting-interface-list'][0])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+        self.assertEqual('XPDR1-NETWORK1-OTUC4', response['interface'][0]['supporting-interface-list'][0])
  
      def test_82a_check_interface_ODUFLEX_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-ODUFLEX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUFLEX')
+        self.assertEqual(response['status_code'], requests.codes.ok)
          input_dict_1 = {'name': 'XPDR1-NETWORK1-ODUFLEX',
                          'administrative-state': 'inService',
                          'supporting-circuit-pack-name': '1/1/2-PLUG-NET',
@@ -1389,110 +1312,115 @@ class TransportPCEtesting(unittest.TestCase):
          input_dict_3 = {"exp-payload-type": "32", "payload-type": "32"}
          input_dict_4 = {'trib-port-number': 1}
  
-        self.assertDictEqual(dict(input_dict_1, **res['interface'][0]),
-                             res['interface'][0])
+        self.assertDictEqual(dict(input_dict_1, **response['interface'][0]),
+                             response['interface'][0])
          self.assertDictEqual(dict(input_dict_2,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'])
          self.assertDictEqual(dict(input_dict_3,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu']),
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['opu'])
          self.assertDictEqual(dict(input_dict_4,
-                                  **res['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
+                                  **response['interface'][0]['org-openroadm-otn-odu-interfaces:odu'][
                                        'parent-odu-allocation']),
-                             res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
-        self.assertIn('1.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+                             response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation'])
+        self.assertIn('1.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('1.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('1.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('2.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('2.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('2.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('2.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('3.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('3.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('3.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('3.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('4.1', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('4.1', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertIn('4.20', res['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
+        self.assertIn('4.20', response['interface'][0]['org-openroadm-otn-odu-interfaces:odu']['parent-odu-allocation']
                        ['opucn-trib-slots'])
-        self.assertEqual('XPDR1-NETWORK1-ODUC4', res['interface'][0]['supporting-interface-list'][0])
+        self.assertEqual('XPDR1-NETWORK1-ODUC4', response['interface'][0]['supporting-interface-list'][0])
  
      def test_83_delete_400GE_service(self):
-        response = test_utils.service_delete_request("service-400GE")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service-400GE"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_84_get_no_service(self):
-        response = test_utils.get_service_list_request("")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        res = response.json()
-        self.assertIn(
-            {"error-type": "application", "error-tag": "data-missing",
-             "error-message": "Request could not be completed because the relevant data model content does not exist"},
-            res['errors']['error'])
+        response = test_utils_rfc8040.get_ordm_serv_list_request()
+        self.assertEqual(response['status_code'], requests.codes.conflict)
+        self.assertIn(response['service-list'], (
+            {
+                "error-type": "protocol",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }, {
+                "error-type": "application",
+                "error-tag": "data-missing",
+                "error-message":
+                    "Request could not be completed because the relevant data "
+                    "model content does not exist"
+            }))
          time.sleep(1)
  
      def test_85_check_no_interface_ODUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-ODUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-ODUC4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_86_check_no_interface_OTUC4_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-OTUC4")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTUC4')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_87_check_no_interface_OTSI_GROUP_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-OTSIGROUP-400G")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-OTSIGROUP-400G')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_88_check_no_interface_OTSI_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-NETWORK1-755:768")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-NETWORK1-755:768')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_89_check_no_interface_400GE_CLIENT_xpdra2(self):
-        response = test_utils.check_netconf_node_request(
-            "XPDR-A2", "interface/XPDR1-CLIENT1-ETHERNET")
-        self.assertEqual(response.status_code, requests.codes.conflict)
+        response = test_utils_rfc8040.check_node_attribute_request(
+            'XPDR-A2', 'interface', 'XPDR1-CLIENT1-ETHERNET')
+        self.assertEqual(response['status_code'], requests.codes.conflict)
  
      def test_90_disconnect_xponders_from_roadm(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        links = res['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
              if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
-                link_name = link["link-id"]
-                response = test_utils.delete_request(url+link_name)
-                self.assertEqual(response.status_code, requests.codes.ok)
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_91_disconnect_xpdra2(self):
-        response = test_utils.unmount_device("XPDR-A2")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-A2")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_92_disconnect_xpdrc2(self):
-        response = test_utils.unmount_device("XPDR-C2")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-C2")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_93_disconnect_roadmA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_94_disconnect_roadmC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py b/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py

index bd7f3f9c25d2aad864be5937591883eed6616d4c..a456d8a1df1513a11884313fa4926a286f0bd986 100644 (file)
--- a/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py
+++ b/tests/transportpce_tests/hybrid/test03_autonomous_reroute.py
@@ -24,7 +24,7 @@ import sys
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEtesting(unittest.TestCase):
@@ -33,56 +33,65 @@ class TransportPCEtesting(unittest.TestCase):
      NODE_VERSION_221 = '2.2.1'
      NODE_VERSION_71 = '7.1'
  
-    cr_serv_sample_data = {
-        "input": {
-            "sdnc-request-header": {
-                "request-id": "request-1",
-                "rpc-action": "service-create",
-                "request-system-id": "appname"
-            },
-            "service-name": "service1",
-            "common-id": "commonId",
-            "connection-type": "service",
-            "service-resiliency": {
-                "resiliency": "org-openroadm-common-service-types:restorable"
-            },
-            "service-a-end": {
-                "service-rate": "400",
-                "node-id": "XPDR-A2",
-                "service-format": "Ethernet",
-                "clli": "NodeA",
-                "tx-direction": [
-                    {
-                        "index": 0
-                    }
-                ],
-                "rx-direction": [
-                    {
-                        "index": 0
-                    }
-                ],
-                "optic-type": "gray"
-            },
-            "service-z-end": {
-                "service-rate": "400",
-                "node-id": "XPDR-C2",
-                "service-format": "Ethernet",
-                "clli": "NodeC",
-                "tx-direction": [
-                    {
-                        "index": 0
-                    }
-                ],
-                "rx-direction": [
-                    {
-                        "index": 0
-                    }
-                ],
-                "optic-type": "gray"
-            },
-            "due-date": "2018-06-15T00:00:01Z",
-            "operator-contact": "pw1234"
-        }
+    cr_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "request-1",
+            "rpc-action": "service-create",
+            "request-system-id": "appname"
+        },
+        "service-name": "service1",
+        "common-id": "commonId",
+        "connection-type": "service",
+        "service-resiliency": {
+            "resiliency": "org-openroadm-common-service-types:restorable"
+        },
+        "service-a-end": {
+            "service-rate": "400",
+            "node-id": "XPDR-A2",
+            "service-format": "Ethernet",
+            "clli": "NodeA",
+            "tx-direction": [
+                {
+                    "index": 0
+                }
+            ],
+            "rx-direction": [
+                {
+                    "index": 0
+                }
+            ],
+            "optic-type": "gray"
+        },
+        "service-z-end": {
+            "service-rate": "400",
+            "node-id": "XPDR-C2",
+            "service-format": "Ethernet",
+            "clli": "NodeC",
+            "tx-direction": [
+                {
+                    "index": 0
+                }
+            ],
+            "rx-direction": [
+                {
+                    "index": 0
+                }
+            ],
+            "optic-type": "gray"
+        },
+        "due-date": "2018-06-15T00:00:01Z",
+        "operator-contact": "pw1234"
+    }
+
+    del_serv_input_data = {
+        "sdnc-request-header": {
+            "request-id": "e3028bae-a90f-4ddd-a83f-cf224eba0e58",
+            "rpc-action": "service-delete",
+            "request-system-id": "appname",
+            "notification-url": "http://localhost:8585/NotificationServer/notify"},
+        "service-delete-req-info": {
+            "service-name": "TBD",
+            "tail-retention": "no"}
      }
  
      service_path_service_1_AtoZ = [
@@ -675,111 +684,111 @@ class TransportPCEtesting(unittest.TestCase):
  
      @classmethod
      def setUpClass(cls):
-        cls.processes = test_utils.start_tpce()
-        cls.processes = test_utils.start_sims([('xpdra2', cls.NODE_VERSION_71),
-                                               ('roadma', cls.NODE_VERSION_221),
-                                               ('roadmb', cls.NODE_VERSION_221),
-                                               ('roadmc', cls.NODE_VERSION_221),
-                                               ('xpdrc2', cls.NODE_VERSION_71)])
+        cls.processes = test_utils_rfc8040.start_tpce()
+        cls.processes = test_utils_rfc8040.start_sims([('xpdra2', cls.NODE_VERSION_71),
+                                                       ('roadma', cls.NODE_VERSION_221),
+                                                       ('roadmb', cls.NODE_VERSION_221),
+                                                       ('roadmc', cls.NODE_VERSION_221),
+                                                       ('xpdrc2', cls.NODE_VERSION_71)])
  
      @classmethod
      def tearDownClass(cls):
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):
-        time.sleep(2)
+        time.sleep(1)
  
      def test_01_connect_xpdra2(self):
-        response = test_utils.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
+        response = test_utils_rfc8040.mount_device("XPDR-A2", ('xpdra2', self.NODE_VERSION_71))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_02_connect_xpdrc2(self):
-        response = test_utils.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
+        response = test_utils_rfc8040.mount_device("XPDR-C2", ('xpdrc2', self.NODE_VERSION_71))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_03_connect_rdma(self):
-        response = test_utils.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
+        response = test_utils_rfc8040.mount_device("ROADM-A1", ('roadma', self.NODE_VERSION_221))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_04_connect_rdmb(self):
-        response = test_utils.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION_221))
+        response = test_utils_rfc8040.mount_device("ROADM-B1", ('roadmb', self.NODE_VERSION_221))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_05_connect_rdmc(self):
-        response = test_utils.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
+        response = test_utils_rfc8040.mount_device("ROADM-C1", ('roadmc', self.NODE_VERSION_221))
          self.assertEqual(response.status_code,
-                         requests.codes.created, test_utils.CODE_SHOULD_BE_201)
+                         requests.codes.created, test_utils_rfc8040.CODE_SHOULD_BE_201)
  
      def test_06_connect_xprda2_1_N1_to_roadma_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Xponder Roadm Link created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_07_connect_roadma_PP1_to_xpdra2_1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "1", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Roadm Xponder links created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_08_connect_xprdc2_1_N1_to_roadmc_PP1(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Xponder Roadm Link created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_09_connect_roadmc_PP1_to_xpdrc2_1_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "1", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Roadm Xponder links created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '1', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP1-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_10_connect_xprda2_3_N1_to_roadma_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-A2", "3", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Xponder Roadm Link created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_11_connect_roadma_PP2_to_xpdra2_3_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-A2", "3", "1",
-                                                          "ROADM-A1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Roadm Xponder links created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-A2', 'xpdr-num': '3', 'network-num': '1',
+                             'rdm-node': 'ROADM-A1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_12_connect_xprdc2_3_N1_to_roadmc_PP2(self):
-        response = test_utils.connect_xpdr_to_rdm_request("XPDR-C2", "3", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Xponder Roadm Link created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-xpdr-rdm-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Xponder Roadm Link created successfully', response["output"]["result"])
  
      def test_13_connect_roadmc_PP2_to_xpdrc2_3_N1(self):
-        response = test_utils.connect_rdm_to_xpdr_request("XPDR-C2", "3", "1",
-                                                          "ROADM-C1", "1", "SRG1-PP2-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertIn('Roadm Xponder links created successfully',
-                      response.json()["output"]["result"])
-        time.sleep(2)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-networkutils', 'init-rdm-xpdr-links',
+            {'links-input': {'xpdr-node': 'XPDR-C2', 'xpdr-num': '3', 'network-num': '1',
+                             'rdm-node': 'ROADM-C1', 'srg-num': '1', 'termination-point-num': 'SRG1-PP2-TXRX'}})
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Roadm Xponder links created successfully', response["output"]["result"])
  
      def test_14_add_omsAttributes_roadma_roadmc(self):
          # Config ROADMA-ROADMC oms-attributes
@@ -793,7 +802,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_15_add_omsAttributes_roadmc_roadma(self):
@@ -808,7 +818,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_16_add_omsAttributes_roadma_roadmb(self):
@@ -823,7 +834,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_17_add_omsAttributes_roadmb_roadma(self):
@@ -838,7 +850,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_18_add_omsAttributes_roadmb_roadmc(self):
@@ -853,7 +866,8 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_19_add_omsAttributes_roadmc_roadmb(self):
@@ -868,138 +882,145 @@ class TransportPCEtesting(unittest.TestCase):
                  "fiber-type": "smf",
                  "SRLG-length": 100000,
                  "pmd": 0.5}]}}
-        response = test_utils.add_oms_attr_request("ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
+        response = test_utils_rfc8040.add_oms_attr_request(
+            "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX", data)
          self.assertEqual(response.status_code, requests.codes.created)
  
      def test_20_create_OTS_ROADMA_DEG1(self):
-        response = test_utils.create_ots_oms_request("ROADM-A1", "DEG1-TTP-TXRX")
-        time.sleep(5)
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-A1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-A1',
-                      response.json()["output"]["result"])
+                      response["output"]["result"])
  
      def test_21_create_OTS_ROADMC_DEG2(self):
-        response = test_utils.create_ots_oms_request("ROADM-C1", "DEG2-TTP-TXRX")
-        time.sleep(5)
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-C1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-C1',
-                      response.json()["output"]["result"])
+                      response["output"]["result"])
  
      def test_22_create_OTS_ROADMB_DEG1(self):
-        response = test_utils.create_ots_oms_request("ROADM-B1", "DEG1-TTP-TXRX")
-        time.sleep(5)
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-B1',
+                'logical-connection-point': 'DEG1-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX successfully created on node ROADM-B1',
-                      response.json()["output"]["result"])
+                      response["output"]["result"])
  
      def test_23_create_OTS_ROADMB_DEG2(self):
-        response = test_utils.create_ots_oms_request("ROADM-B1", "DEG2-TTP-TXRX")
-        time.sleep(5)
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-device-renderer', 'create-ots-oms',
+            {
+                'node-id': 'ROADM-B1',
+                'logical-connection-point': 'DEG2-TTP-TXRX'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Interfaces OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX successfully created on node ROADM-B1',
-                      response.json()["output"]["result"])
+                      response["output"]["result"])
  
      def test_24_calculate_span_loss_base_all(self):
-        data = {
-            "input": {
-                "src-type": "all"
-            }
-        }
-        response = test_utils.post_request("{}/operations/transportpce-olm:calculate-spanloss-base", data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertIn('Success',
-                      res["output"]["result"])
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'transportpce-olm', 'calculate-spanloss-base',
+            {
+                'src-type': 'all'
+            })
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertIn('Success', response["output"]["result"])
          self.assertIn({
              "spanloss": "25.7",
              "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
+        self.assertIn({
+            "spanloss": "17.6",
+            "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "23.6",
              "link-id": "ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "23.6",
              "link-id": "ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
-        self.assertIn({
-            "spanloss": "17.6",
-            "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "25.7",
              "link-id": "ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
          self.assertIn({
              "spanloss": "17.6",
              "link-id": "ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX"
-        }, res["output"]["spans"])
+        }, response["output"]["spans"])
+        time.sleep(1)
  
      # test service-create for Eth service from xpdr to xpdr with service-resiliency
      def test_25_create_eth_service1_with_service_resiliency_restorable(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service1"
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      response.json()['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_26_get_eth_service1(self):
-        response = test_utils.get_service_list_request("services/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['operational-state'], 'inService')
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service1')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
          self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service1')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        self.assertEqual(
-            res['services'][0]['service-resiliency']['resiliency'], 'org-openroadm-common-service-types:restorable')
-        time.sleep(2)
+            response['services'][0]['service-resiliency']['resiliency'],
+            'org-openroadm-common-service-types:restorable')
+        time.sleep(1)
  
      def test_27_get_service_path_service_1(self):
-        response = test_utils.get_service_path_list_request("service-paths/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertCountEqual(self.service_path_service_1_AtoZ,
-                              response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+        response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertCountEqual(
+            self.service_path_service_1_AtoZ,
+            response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
  
      # test service-create for Eth service from xpdr to xpdr without service-resiliency
      def test_28_create_eth_service2_without_service_resiliency(self):
-        self.cr_serv_sample_data["input"]["service-name"] = "service2"
-        del self.cr_serv_sample_data["input"]["service-resiliency"]
-        response = test_utils.service_create_request(self.cr_serv_sample_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.cr_serv_input_data["service-name"] = "service2"
+        del self.cr_serv_input_data["service-resiliency"]
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-create',
+            self.cr_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('PCE calculation in progress',
-                      response.json()['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_29_get_eth_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['operational-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        self.assertNotIn('service-resiliency', res['services'][0])
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service2')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        self.assertNotIn('service-resiliency', response['services'][0])
+        time.sleep(1)
  
      def test_30_get_service_path_service_2(self):
-        response = test_utils.get_service_path_list_request("service-paths/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        self.assertCountEqual(self.service_path_service_2_AtoZ,
-                              response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+        response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertCountEqual(
+            self.service_path_service_2_AtoZ,
+            response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
  
      # Degrade ROADM-A1-ROADM-C1 link
      def test_31_set_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
@@ -1042,8 +1063,9 @@ class TransportPCEtesting(unittest.TestCase):
              }
          }
          response = requests.request("POST", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully set !")
          time.sleep(self.WAITING * 2)
@@ -1052,31 +1074,25 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_26_get_eth_service1()
  
      def test_33_get_service_path_service_1(self):
-        response = test_utils.get_service_path_list_request("service-paths/service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        print(response.json())
-        self.assertCountEqual(self.service_path_service_1_rerouted_AtoZ,
-                              response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+        response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service1")
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertCountEqual(
+            self.service_path_service_1_rerouted_AtoZ,
+            response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
  
      def test_34_get_eth_service2(self):
-        response = test_utils.get_service_list_request("services/service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['services'][0]['operational-state'], 'outOfService')
-        self.assertEqual(
-            res['services'][0]['administrative-state'], 'inService')
-        self.assertEqual(
-            res['services'][0]['service-name'], 'service2')
-        self.assertEqual(
-            res['services'][0]['connection-type'], 'service')
-        self.assertEqual(
-            res['services'][0]['lifecycle-state'], 'planned')
-        self.assertNotIn('service-resiliency', res['services'][0])
-        time.sleep(2)
+        response = test_utils_rfc8040.get_ordm_serv_list_attr_request("services", "service2")
+        self.assertEqual(response['services'][0]['operational-state'], 'outOfService')
+        self.assertEqual(response['services'][0]['administrative-state'], 'inService')
+        self.assertEqual(response['services'][0]['service-name'], 'service2')
+        self.assertEqual(response['services'][0]['connection-type'], 'service')
+        self.assertEqual(response['services'][0]['lifecycle-state'], 'planned')
+        self.assertNotIn('service-resiliency', response['services'])
+        time.sleep(1)
  
      def test_35_get_service_path_service_2(self):
-        response = test_utils.get_service_path_list_request("service-paths/service2")
+        response = test_utils_rfc8040.get_serv_path_list_attr("service-paths", "service2")
+        self.assertEqual(response['status_code'], requests.codes.ok)
          index = self.service_path_service_2_AtoZ.index(
              {
                  'id': '10',
@@ -1095,9 +1111,8 @@ class TransportPCEtesting(unittest.TestCase):
                  'tp-node-id': 'ROADM-A1-DEG2'
              }
          }] + self.service_path_service_2_AtoZ[index + 1:]
-        self.assertEqual(response.status_code, requests.codes.ok)
          self.assertCountEqual(service_path_expected,
-                              response.json()['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
+                              response['service-paths'][0]['path-description']['aToZ-direction']['aToZ'])
  
      # Restore ROADM-A1-ROADM-C1 link
      def test_36_clear_pm_ROADMA_OTS_DEG2_TTP_TXRX_OpticalPowerInput(self):
@@ -1126,8 +1141,9 @@ class TransportPCEtesting(unittest.TestCase):
              }
          }
          response = requests.request("POST", url.format("http://127.0.0.1:8141/restconf"),
-                                    data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    data=json.dumps(body), headers=test_utils_rfc8040.TYPE_APPLICATION_JSON,
+                                    auth=(test_utils_rfc8040.ODL_LOGIN, test_utils_rfc8040.ODL_PWD),
+                                    timeout=test_utils_rfc8040.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          self.assertEqual(response.json()['output']['status-message'], "The PMs has been successfully released !")
          time.sleep(2)
@@ -1145,52 +1161,54 @@ class TransportPCEtesting(unittest.TestCase):
          self.test_30_get_service_path_service_2()
  
      def test_41_delete_eth_service2(self):
-        response = test_utils.service_delete_request("service2")
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service2"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      response.json()['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_42_delete_eth_service1(self):
-        response = test_utils.service_delete_request("service1")
-        self.assertEqual(response.status_code, requests.codes.ok)
+        self.del_serv_input_data["service-delete-req-info"]["service-name"] = "service1"
+        response = test_utils_rfc8040.transportpce_api_rpc_request(
+            'org-openroadm-service', 'service-delete',
+            self.del_serv_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Renderer service delete in progress',
-                      response.json()['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(self.WAITING)
  
      def test_43_disconnect_xponders_from_roadm(self):
-        url = "{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:link/"
-        response = test_utils.get_ordm_topo_request("")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        links = response.json()['network'][0]['ietf-network-topology:link']
+        response = test_utils_rfc8040.get_ietf_network_request('openroadm-topology', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        links = response['network'][0]['ietf-network-topology:link']
          for link in links:
              if link["org-openroadm-common-network:link-type"] in ('XPONDER-OUTPUT', 'XPONDER-INPUT'):
-                self.assertEqual(test_utils.delete_request(url + link["link-id"]).status_code, requests.codes.ok)
+                response = test_utils_rfc8040.del_ietf_network_link_request(
+                    'openroadm-topology', link['link-id'], 'config')
+                self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_44_disconnect_xpdra2(self):
-        response = test_utils.unmount_device("XPDR-A2")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-A2")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_45_disconnect_xpdrc2(self):
-        response = test_utils.unmount_device("XPDR-C2")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("XPDR-C2")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_46_disconnect_roadmA(self):
-        response = test_utils.unmount_device("ROADM-A1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-A1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_47_disconnect_roadmB(self):
-        response = test_utils.unmount_device("ROADM-B1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-B1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
      def test_48_disconnect_roadmC(self):
-        response = test_utils.unmount_device("ROADM-C1")
-        self.assertEqual(response.status_code, requests.codes.ok,
-                         test_utils.CODE_SHOULD_BE_200)
+        response = test_utils_rfc8040.unmount_device("ROADM-C1")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/pce/test01_pce.py b/tests/transportpce_tests/pce/test01_pce.py

index 6477c54f45355766f3f5a99a41e6ea41365c0bf2..29bc687995e32b980a99b241d4f4490ce425f7c2 100644 (file)
--- a/tests/transportpce_tests/pce/test01_pce.py
+++ b/tests/transportpce_tests/pce/test01_pce.py
@@ -20,10 +20,30 @@ import requests
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCEtesting(unittest.TestCase):
+    path_computation_input_data = {
+        "service-name": "service-1",
+        "resource-reserve": "true",
+        "service-handler-header": {
+            "request-id": "request1"
+        },
+        "service-a-end": {
+            "service-rate": "100",
+            "clli": "NodeA",
+            "service-format": "Ethernet",
+            "node-id": "XPDRA01"
+        },
+        "service-z-end": {
+            "service-rate": "100",
+            "clli": "NodeC",
+            "service-format": "Ethernet",
+            "node-id": "XPDRC01"
+        },
+        "pce-routing-metric": "hop-count"
+    }
  
      simple_topo_bi_dir_data = None
      simple_topo_uni_dir_data = None
@@ -37,18 +57,18 @@ class TransportPCEtesting(unittest.TestCase):
          sample_files_parsed = False
          try:
              TOPO_BI_DIR_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                                            "..", "..", "sample_configs", "honeynode-topo.xml")
+                                            "..", "..", "sample_configs", "honeynode-topo.json")
              with open(TOPO_BI_DIR_FILE, 'r', encoding='utf-8') as topo_bi_dir:
                  cls.simple_topo_bi_dir_data = topo_bi_dir.read()
  
              TOPO_UNI_DIR_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                                             "..", "..", "sample_configs", "NW-simple-topology.xml")
+                                             "..", "..", "sample_configs", "NW-simple-topology.json")
  
              with open(TOPO_UNI_DIR_FILE, 'r', encoding='utf-8') as topo_uni_dir:
                  cls.simple_topo_uni_dir_data = topo_uni_dir.read()
  
              TOPO_UNI_DIR_COMPLEX_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                                                     "..", "..", "sample_configs", "NW-for-test-5-4.xml")
+                                                     "..", "..", "sample_configs", "NW-for-test-5-4.json")
              with open(TOPO_UNI_DIR_COMPLEX_FILE, 'r', encoding='utf-8') as topo_uni_dir_complex:
                  cls.complex_topo_uni_dir_data = topo_uni_dir_complex.read()
              PORT_MAPPING_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)),
@@ -69,327 +89,272 @@ class TransportPCEtesting(unittest.TestCase):
              if sample_files_parsed:
                  print("sample files content loaded")
  
-        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils_rfc8040.start_tpce()
  
      @classmethod
      def tearDownClass(cls):
+        # clean datastores
+        test_utils_rfc8040.del_portmapping()
+        test_utils_rfc8040.del_ietf_network('openroadm-topology')
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):  # instruction executed before each test method
          time.sleep(1)
  
-     # Load port mapping
-    def test_00_load_port_mapping(self):
-        response = test_utils.rawpost_request(test_utils.URL_FULL_PORTMAPPING, self.port_mapping_data)
-        self.assertEqual(response.status_code, requests.codes.no_content)
-        time.sleep(2)
+    # Load port mapping
+    def test_01_load_port_mapping(self):
+        response = test_utils_rfc8040.post_portmapping(self.port_mapping_data)
+        self.assertIn(response['status_code'], (requests.codes.created, requests.codes.no_content))
+        time.sleep(1)
  
-     # Load simple bidirectional topology
-    def test_01_load_simple_topology_bi(self):
-        response = test_utils.put_xmlrequest(test_utils.URL_CONFIG_ORDM_TOPO, self.simple_topo_bi_dir_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
+    # Load simple bidirectional topology
+    def test_02_load_simple_topology_bi(self):
+        response = test_utils_rfc8040.put_ietf_network('openroadm-topology', self.simple_topo_bi_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Get existing nodeId
-    def test_02_get_nodeId(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['node'][0]['node-id'], 'ROADMA01-SRG1')
+    def test_03_get_nodeId(self):
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'ROADMA01-SRG1', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['node']['node-id'], 'ROADMA01-SRG1')
          time.sleep(1)
  
      # Get existing linkId
-    def test_03_get_linkId(self):
-        response = test_utils.get_ordm_topo_request("link/XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['ietf-network-topology:link'][0]['link-id'],
-            'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX')
+    def test_04_get_linkId(self):
+        response = test_utils_rfc8040.get_ietf_network_link_request(
+            'openroadm-topology', 'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['link']['link-id'], 'XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX')
          time.sleep(1)
  
      # Path Computation success
-    def test_04_path_computation_xpdr_bi(self):
-        response = test_utils.path_computation_request("request-1", "service-1",
-                                                       {"node-id": "XPDRA01", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "nodeA"},
-                                                       {"node-id": "XPDRC01", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "nodeC"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_05_path_computation_xpdr_bi(self):
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(5)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(2)
  
      # Path Computation success
-    def test_05_path_computation_rdm_bi(self):
-        response = test_utils.path_computation_request("request-1", "service-1",
-                                                       {"node-id": "ROADMA01", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "NodeA"},
-                                                       {"node-id": "ROADMC01", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "NodeC"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_06_path_computation_rdm_bi(self):
+        self.path_computation_input_data["service-a-end"]["node-id"] = "ROADMA01"
+        self.path_computation_input_data["service-z-end"]["node-id"] = "ROADMC01"
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(5)
-
-    # Delete topology
-    def test_06_delete_simple_topology_bi(self):
-        response = test_utils.delete_request(test_utils.URL_CONFIG_ORDM_TOPO)
-        self.assertEqual(response.status_code, requests.codes.ok)
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(2)
  
-    # Test deleted topology
-    def test_07_test_topology_simple_bi_deleted(self):
-        response = test_utils.get_ordm_topo_request("node/ROADMA01-SRG1")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        time.sleep(1)
-
      # Load simple bidirectional topology
-    def test_08_load_simple_topology_uni(self):
-        response = test_utils.put_xmlrequest(test_utils.URL_CONFIG_ORDM_TOPO, self.simple_topo_uni_dir_data)
-        self.assertEqual(response.status_code, 201)
-        time.sleep(2)
+    def test_07_load_simple_topology_uni(self):
+        response = test_utils_rfc8040.put_ietf_network('openroadm-topology', self.simple_topo_uni_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Get existing nodeId
-    def test_09_get_nodeId(self):
-        response = test_utils.get_ordm_topo_request("node/XPONDER-1-2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['node'][0]['node-id'],
-            'XPONDER-1-2')
+    def test_08_get_nodeId(self):
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPONDER-1-2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['node']['node-id'], 'XPONDER-1-2')
          time.sleep(1)
  
      # Get existing linkId
-    def test_10_get_linkId(self):
-        response = test_utils.get_ordm_topo_request("link/XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['ietf-network-topology:link'][0]['link-id'],
-            'XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX')
+    def test_09_get_linkId(self):
+        response = test_utils_rfc8040.get_ietf_network_link_request(
+            'openroadm-topology', 'XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['link']['link-id'], 'XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX')
          time.sleep(1)
  
      # Path Computation success
-    def test_11_path_computation_xpdr_uni(self):
-        response = test_utils.path_computation_request("request-1", "service-1",
-                                                       {"node-id": "XPONDER-1-2", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "ORANGE1"},
-                                                       {"node-id": "XPONDER-3-2", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "ORANGE3"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_10_path_computation_xpdr_uni(self):
+        self.path_computation_input_data["service-a-end"]["node-id"] = "XPONDER-1-2"
+        self.path_computation_input_data["service-a-end"]["clli"] = "ORANGE1"
+        self.path_computation_input_data["service-z-end"]["node-id"] = "XPONDER-3-2"
+        self.path_computation_input_data["service-z-end"]["clli"] = "ORANGE3"
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(5)
+                      response['output']['configuration-response-common']['response-message'])
+        time.sleep(2)
  
      # Path Computation success
-    def test_12_path_computation_rdm_uni(self):
-        response = test_utils.path_computation_request("request1", "service1",
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "clli": "cll21", "node-id": "OpenROADM-2-1"},
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "clli": "ncli22", "node-id": "OpenROADM-2-2"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_11_path_computation_rdm_uni(self):
+        self.path_computation_input_data["service-a-end"]["node-id"] = "OpenROADM-2-1"
+        self.path_computation_input_data["service-a-end"]["clli"] = "cll21"
+        self.path_computation_input_data["service-z-end"]["node-id"] = "OpenROADM-2-2"
+        self.path_computation_input_data["service-z-end"]["clli"] = "ncli22"
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          # ZtoA path test
-        atozList = len(res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'])
-        ztoaList = len(res['output']['response-parameters']['path-description']['zToA-direction']['zToA'])
+        atozList = len(response['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'])
+        ztoaList = len(response['output']['response-parameters']['path-description']['zToA-direction']['zToA'])
          self.assertEqual(atozList, 15)
          self.assertEqual(ztoaList, 15)
          for i in range(0, 15):
-            atoz = res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
-            ztoa = res['output']['response-parameters']['path-description']['zToA-direction']['zToA'][i]
+            atoz = response['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
+            ztoa = response['output']['response-parameters']['path-description']['zToA-direction']['zToA'][i]
              if atoz['id'] == '14':
                  self.assertEqual(atoz['resource']['tp-id'], 'SRG1-PP1-TX')
              if ztoa['id'] == '0':
                  self.assertEqual(ztoa['resource']['tp-id'], 'SRG1-PP1-RX')
-        time.sleep(5)
-
-    # Delete topology
-    def test_13_delete_simple_topology(self):
-        response = test_utils.delete_request(test_utils.URL_CONFIG_ORDM_TOPO)
-        self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
-    # Test deleted topology
-    def test_14_test_topology_simple_deleted(self):
-        response = test_utils.get_ordm_topo_request("node/XPONDER-1-2")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        time.sleep(1)
-
      # Load complex topology
-    def test_15_load_complex_topology(self):
-        response = test_utils.put_xmlrequest(test_utils.URL_CONFIG_ORDM_TOPO, self.complex_topo_uni_dir_data)
-        self.assertEqual(response.status_code, 201)
-        time.sleep(2)
+    def test_12_load_complex_topology(self):
+        response = test_utils_rfc8040.put_ietf_network('openroadm-topology', self.complex_topo_uni_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Get existing nodeId
-    def test_16_get_nodeId(self):
-        response = test_utils.get_ordm_topo_request("node/XPONDER-3-2")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(
-            res['node'][0]['node-id'],
-            'XPONDER-3-2')
+    def test_13_get_nodeId(self):
+        response = test_utils_rfc8040.get_ietf_network_node_request('openroadm-topology', 'XPONDER-3-2', 'config')
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['node']['node-id'], 'XPONDER-3-2')
          time.sleep(1)
  
      # Test failed path computation
-    def test_17_fail_path_computation(self):
-        response = test_utils.post_request(test_utils.URL_PATH_COMPUTATION_REQUEST,
-                                           {"input": {"service-handler-header": {"request-id": "request-1"}}})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_14_fail_path_computation(self):
+        del self.path_computation_input_data["service-name"]
+        del self.path_computation_input_data["service-a-end"]
+        del self.path_computation_input_data["service-z-end"]
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Service Name is not set',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
          time.sleep(2)
  
      # Test1 success path computation
-    def test_18_success1_path_computation(self):
-        response = test_utils.path_computation_request("request1", "service1",
-                                                       {"service-format": "Ethernet", "service-rate": "100",
-                                                        "clli": "ORANGE2", "node-id": "XPONDER-2-2"},
-                                                       {"service-format": "Ethernet", "service-rate": "100",
-                                                           "clli": "ORANGE1", "node-id": "XPONDER-1-2"},
-                                                       {"customer-code": ["Some customer-code"],
-                                                           "co-routing": {
-                                                           "service-identifier-list": [
-                                                               {
-                                                                   "service-identifier": "Some existing-service",
-                                                               }
-                                                           ]
-                                                       }
-                                                       },
-                                                       {"customer-code": ["Some customer-code"],
-                                                           "co-routing": {
-                                                           "service-identifier-list": [
-                                                               {
-                                                                   "service-identifier": "Some existing-service",
-                                                               }
-                                                           ]
-                                                       }
-                                                       }, "hop-count")
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_15_success1_path_computation(self):
+        self.path_computation_input_data["service-name"] = "service 1"
+        self.path_computation_input_data["service-a-end"] = {"service-format": "Ethernet", "service-rate": "100",
+                                                             "clli": "ORANGE2", "node-id": "XPONDER-2-2"}
+        self.path_computation_input_data["service-z-end"] = {"service-format": "Ethernet", "service-rate": "100",
+                                                             "clli": "ORANGE1", "node-id": "XPONDER-1-2"}
+        self.path_computation_input_data["hard-constraints"] = {"customer-code": ["Some customer-code"],
+                                                                "co-routing": {
+                                                                    "service-identifier-list": [{
+                                                                        "service-identifier": "Some existing-service"}]
+        }}
+        self.path_computation_input_data["soft-constraints"] = {"customer-code": ["Some customer-code"],
+                                                                "co-routing": {
+                                                                    "service-identifier-list": [{
+                                                                        "service-identifier": "Some existing-service"}]
+        }}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        time.sleep(5)
+                      response['output']['configuration-response-common']['response-message'])
+
+        time.sleep(4)
  
      # Test2 success path computation with path description
-    def test_19_success2_path_computation(self):
-        response = test_utils.path_computation_request("request 1", "service 1",
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-3-2", "clli": "ORANGE3"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_16_success2_path_computation(self):
+        self.path_computation_input_data["service-a-end"]["node-id"] = "XPONDER-1-2"
+        self.path_computation_input_data["service-a-end"]["clli"] = "ORANGE1"
+        self.path_computation_input_data["service-z-end"]["node-id"] = "XPONDER-3-2"
+        self.path_computation_input_data["service-z-end"]["clli"] = "ORANGE3"
+        del self.path_computation_input_data["hard-constraints"]
+        del self.path_computation_input_data["soft-constraints"]
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        self.assertEqual(5, res['output']['response-parameters']['path-description']
+                      response['output']['configuration-response-common']['response-message'])
+        self.assertEqual(5, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['aToZ-wavelength-number'])
-        self.assertEqual(5, res['output']['response-parameters']['path-description']
+        self.assertEqual(5, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['zToA-wavelength-number'])
-        time.sleep(5)
+        time.sleep(4)
  
      # Test3 success path computation with hard-constraints exclude
-    def test_20_success3_path_computation(self):
-        response = test_utils.path_computation_request("request 1", "service 1",
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-1-2", "clli": "ORANGE1"},
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-3-2", "clli": "ORANGE3"},
-                                                       {"exclude": {"node-id": ["OpenROADM-2-1", "OpenROADM-2-2"]}})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_17_success3_path_computation(self):
+        self.path_computation_input_data["hard-constraints"] = {"exclude":
+                                                                {"node-id": ["OpenROADM-2-1", "OpenROADM-2-2"]}}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        self.assertEqual(9, res['output']['response-parameters']['path-description']
+                      response['output']['configuration-response-common']['response-message'])
+        self.assertEqual(9, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['aToZ-wavelength-number'])
-        self.assertEqual(9, res['output']['response-parameters']['path-description']
+        self.assertEqual(9, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['zToA-wavelength-number'])
-        time.sleep(5)
+        time.sleep(4)
  
      # Path computation before deleting oms-attribute of the link :openroadm1-3 to openroadm1-2
-    def test_21_path_computation_before_oms_attribute_deletion(self):
-        response = test_utils.path_computation_request("request 1", "service 1",
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-2-2", "clli": "ORANGE2"},
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-1-2", "clli": "ORANGE1"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_18_path_computation_before_oms_attribute_deletion(self):
+        self.path_computation_input_data["service-a-end"]["node-id"] = "XPONDER-2-2"
+        self.path_computation_input_data["service-a-end"]["clli"] = "ORANGE2"
+        self.path_computation_input_data["service-z-end"]["node-id"] = "XPONDER-1-2"
+        self.path_computation_input_data["service-z-end"]["clli"] = "ORANGE1"
+        del self.path_computation_input_data["hard-constraints"]
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        nbElmPath = len(res['output']['response-parameters']['path-description']
-                        ['aToZ-direction']['aToZ'])
-        self.assertEqual(31, nbElmPath)
+                      response['output']['configuration-response-common']['response-message'])
+        path_depth = len(response['output']['response-parameters']['path-description']
+                         ['aToZ-direction']['aToZ'])
+        self.assertEqual(31, path_depth)
          link = {"link-id": "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2", "state": "inService"}
          find = False
-        for i in range(0, nbElmPath):
-            resource_i = (res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
-                             ['resource'])
+        for i in range(0, path_depth):
+            resource_i = (response['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
+                          ['resource'])
              if resource_i == link:
                  find = True
          self.assertEqual(find, True)
-        time.sleep(5)
+        time.sleep(4)
  
      # Delete oms-attribute in the link :openroadm1-3 to openroadm1-2
-    def test_22_delete_oms_attribute_in_openroadm13toopenroadm12_link(self):
-        response = test_utils.del_oms_attr_request("OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2")
-        self.assertEqual(response.status_code, requests.codes.ok)
+    def test_19_delete_oms_attribute_in_openroadm13toopenroadm12_link(self):
+        response = test_utils_rfc8040.del_oms_attr_request("OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2")
+        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.no_content))
          time.sleep(2)
  
      # Path computation after deleting oms-attribute of the link :openroadm1-3 to openroadm1-2
-    def test_23_path_computation_after_oms_attribute_deletion(self):
-        response = test_utils.path_computation_request("request 1", "service 1",
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-2-2", "clli": "ORANGE2"},
-                                                       {"service-rate": "100", "service-format": "Ethernet",
-                                                           "node-id": "XPONDER-1-2", "clli": "ORANGE1"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+    def test_20_path_computation_after_oms_attribute_deletion(self):
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
-        nbElmPath = len(res['output']['response-parameters']['path-description']
-                        ['aToZ-direction']['aToZ'])
-        self.assertEqual(47, nbElmPath)
+                      response['output']['configuration-response-common']['response-message'])
+        path_depth = len(response['output']['response-parameters']['path-description']
+                         ['aToZ-direction']['aToZ'])
+        self.assertEqual(47, path_depth)
          link = {"link-id": "OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2", "state": "inService"}
          find = False
-        for i in range(0, nbElmPath):
-            resource_i = (res['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
-                             ['resource'])
+        for i in range(0, path_depth):
+            resource_i = (response['output']['response-parameters']['path-description']['aToZ-direction']['aToZ'][i]
+                          ['resource'])
              if resource_i == link:
                  find = True
          self.assertNotEqual(find, True)
          time.sleep(5)
  
-    # Delete complex topology
-    def test_24_delete_complex_topology(self):
-        response = test_utils.delete_request(test_utils.URL_CONFIG_ORDM_TOPO)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
-
-    # Test deleted complex topology
-    def test_25_test_topology_complex_deleted(self):
-        response = test_utils.get_ordm_topo_request("node/XPONDER-3-2")
-        self.assertEqual(response.status_code, requests.codes.conflict)
-        time.sleep(1)
-
-    # Delete portmapping
-    def test_26_delete_port_mapping(self):
-        response = test_utils.delete_request(test_utils.URL_FULL_PORTMAPPING)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
-
  
  if __name__ == "__main__":
      unittest.main(verbosity=2)
diff --git a/tests/transportpce_tests/pce/test02_pce_400G.py b/tests/transportpce_tests/pce/test02_pce_400G.py

index db4cb4e2915f67dacfa796dccf0ceb604c5b4f39..d35d814035a5443965c6c9ee6c7bbfcbeb99cea9 100644 (file)
--- a/tests/transportpce_tests/pce/test02_pce_400G.py
+++ b/tests/transportpce_tests/pce/test02_pce_400G.py
@@ -21,10 +21,30 @@ import requests
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportPCE400Gtesting(unittest.TestCase):
+    path_computation_input_data = {
+        "service-name": "service-1",
+        "resource-reserve": "true",
+        "service-handler-header": {
+            "request-id": "request1"
+        },
+        "service-a-end": {
+            "service-rate": "400",
+            "clli": "nodeA",
+            "service-format": "Ethernet",
+            "node-id": "XPDR-A2"
+        },
+        "service-z-end": {
+            "service-rate": "400",
+            "clli": "nodeC",
+            "service-format": "Ethernet",
+            "node-id": "XPDR-C2"
+        },
+        "pce-routing-metric": "hop-count"
+    }
  
      simple_topo_bi_dir_data = None
      port_mapping_data = None
@@ -77,13 +97,17 @@ class TransportPCE400Gtesting(unittest.TestCase):
          finally:
              if sample_files_parsed:
                  print("sample files content loaded")
-        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils_rfc8040.start_tpce()
  
      @classmethod
      def tearDownClass(cls):
+        # clean datastores
+        test_utils_rfc8040.del_portmapping()
+        test_utils_rfc8040.del_ietf_network('openroadm-topology')
+        test_utils_rfc8040.del_ietf_network('otn-topology')
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):  # instruction executed before each test method
@@ -93,182 +117,171 @@ class TransportPCE400Gtesting(unittest.TestCase):
  
      # Load port mapping
      def test_01_load_port_mapping(self):
-        response = test_utils.put_jsonrequest(test_utils.URL_FULL_PORTMAPPING, self.port_mapping_data)
-        self.assertIn(response.status_code, (requests.codes.ok, requests.codes.created))
-        time.sleep(2)
+        response = test_utils_rfc8040.post_portmapping(self.port_mapping_data)
+        self.assertIn(response['status_code'], (requests.codes.created, requests.codes.no_content))
+        time.sleep(1)
  
      # Load openroadm topology
      def test_02_load_openroadm_topology_bi(self):
-        response = test_utils.put_jsonrequest(test_utils.URL_CONFIG_ORDM_TOPO, self.topo_bi_dir_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
+        response = test_utils_rfc8040.put_ietf_network('openroadm-topology', self.topo_bi_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Path Computation success
      def test_03_path_computation_400G_xpdr_bi(self):
-        response = test_utils.path_computation_request("request-1", "service-1",
-                                                       {"node-id": "XPDR-A2", "service-rate": "400",
-                                                           "service-format": "Ethernet", "clli": "nodeA"},
-                                                       {"node-id": "XPDR-C2", "service-rate": "400",
-                                                           "service-format": "Ethernet", "clli": "nodeC"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
  
-        self.assertEqual(1, res['output']['response-parameters']['path-description']
+        self.assertEqual(1, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['aToZ-wavelength-number'])
-        self.assertEqual(400, res['output']['response-parameters']['path-description']
+        self.assertEqual(400, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['rate'])
-        self.assertEqual(196.0375, res['output']['response-parameters']['path-description']
-                         ['aToZ-direction']['aToZ-min-frequency'])
-        self.assertEqual(196.12500, res['output']['response-parameters']['path-description']
-                         ['aToZ-direction']['aToZ-max-frequency'])
-        self.assertEqual('dp-qam16', res['output']['response-parameters']['path-description']
+        self.assertEqual(196.0375, float(response['output']['response-parameters']['path-description']
+                         ['aToZ-direction']['aToZ-min-frequency']))
+        self.assertEqual(196.12500, float(response['output']['response-parameters']['path-description']
+                         ['aToZ-direction']['aToZ-max-frequency']))
+        self.assertEqual('dp-qam16', response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['modulation-format'])
  
-        self.assertEqual(1, res['output']['response-parameters']['path-description']
+        self.assertEqual(1, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['zToA-wavelength-number'])
-        self.assertEqual(400, res['output']['response-parameters']['path-description']
+        self.assertEqual(400, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['rate'])
-        self.assertEqual(196.0375, res['output']['response-parameters']['path-description']
-                         ['zToA-direction']['zToA-min-frequency'])
-        self.assertEqual(196.12500, res['output']['response-parameters']['path-description']
-                         ['zToA-direction']['zToA-max-frequency'])
-        self.assertEqual('dp-qam16', res['output']['response-parameters']['path-description']
+        self.assertEqual(196.0375, float(response['output']['response-parameters']['path-description']
+                         ['zToA-direction']['zToA-min-frequency']))
+        self.assertEqual(196.12500, float(response['output']['response-parameters']['path-description']
+                         ['zToA-direction']['zToA-max-frequency']))
+        self.assertEqual('dp-qam16', response['output']['response-parameters']['path-description']
                           ['zToA-direction']['modulation-format'])
-        time.sleep(5)
+        time.sleep(2)
  
      # Load otn topology
      def test_04_load_otn_topology_bi(self):
-        response = test_utils.put_jsonrequest(test_utils.URL_CONFIG_OTN_TOPO, self.otn_topo_bi_dir_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
+        response = test_utils_rfc8040.put_ietf_network('otn-topology', self.otn_topo_bi_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Path Computation success
      def test_05_path_computation_OTUC4_xpdr_bi(self):
-        response = test_utils.path_computation_request("request-1", "service-OTUC4",
-                                                       {"service-rate": "400",
-                                                        "clli": "NodeA",
-                                                        "service-format": "OTU",
-                                                        "node-id": "XPDR-A2",
-                                                        "tx-direction": {"port": {"port-device-name": "XPDR-A2-XPDR2"}}
-                                                        },
-                                                       {"service-rate": "400",
-                                                        "clli": "NodeC",
-                                                        "service-format": "OTU",
-                                                        "node-id": "XPDR-C2",
-                                                        "tx-direction": {"port": {"port-device-name": "XPDR-C2-XPDR2"}}
-                                                        })
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.path_computation_input_data["service-name"] = "service-OTUC4"
+        self.path_computation_input_data["service-a-end"]["service-format"] = "OTU"
+        self.path_computation_input_data["service-a-end"]["tx-direction"] =\
+            {"port": {"port-device-name": "XPDR-A2-XPDR2"}}
+        self.path_computation_input_data["service-z-end"]["service-format"] = "OTU"
+        self.path_computation_input_data["service-z-end"]["tx-direction"] =\
+            {"port": {"port-device-name": "XPDR-C2-XPDR2"}}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
  
-        self.assertEqual(1, res['output']['response-parameters']['path-description']
+        self.assertEqual(1, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['aToZ-wavelength-number'])
-        self.assertEqual(400, res['output']['response-parameters']['path-description']
+        self.assertEqual(400, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['rate'])
-        self.assertEqual(196.0375, res['output']['response-parameters']['path-description']
-                         ['aToZ-direction']['aToZ-min-frequency'])
-        self.assertEqual(196.12500, res['output']['response-parameters']['path-description']
-                         ['aToZ-direction']['aToZ-max-frequency'])
-        self.assertEqual('dp-qam16', res['output']['response-parameters']['path-description']
+        self.assertEqual(196.0375, float(response['output']['response-parameters']['path-description']
+                         ['aToZ-direction']['aToZ-min-frequency']))
+        self.assertEqual(196.12500, float(response['output']['response-parameters']['path-description']
+                         ['aToZ-direction']['aToZ-max-frequency']))
+        self.assertEqual('dp-qam16', response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['modulation-format'])
  
-        self.assertEqual(1, res['output']['response-parameters']['path-description']
+        self.assertEqual(1, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['zToA-wavelength-number'])
-        self.assertEqual(400, res['output']['response-parameters']['path-description']
+        self.assertEqual(400, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['rate'])
-        self.assertEqual(196.0375, res['output']['response-parameters']['path-description']
-                         ['zToA-direction']['zToA-min-frequency'])
-        self.assertEqual(196.12500, res['output']['response-parameters']['path-description']
-                         ['zToA-direction']['zToA-max-frequency'])
-        self.assertEqual('dp-qam16', res['output']['response-parameters']['path-description']
+        self.assertEqual(196.0375, float(response['output']['response-parameters']['path-description']
+                         ['zToA-direction']['zToA-min-frequency']))
+        self.assertEqual(196.12500, float(response['output']['response-parameters']['path-description']
+                         ['zToA-direction']['zToA-max-frequency']))
+        self.assertEqual('dp-qam16', response['output']['response-parameters']['path-description']
                           ['zToA-direction']['modulation-format'])
-        time.sleep(5)
+        time.sleep(2)
  
      # Load otn topology with OTUC4 links
      def test_06_load_otuc4_otn_topology_bi(self):
-        response = test_utils.put_jsonrequest(test_utils.URL_CONFIG_OTN_TOPO, self.otuc4_otn_topo_bi_dir_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
+        response = test_utils_rfc8040.put_ietf_network('otn-topology', self.otuc4_otn_topo_bi_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Path Computation success
      def test_07_path_computation_ODUC4_xpdr_bi(self):
-        response = test_utils.path_computation_request("request-1", "service-ODUC4",
-                                                       {"service-rate": "400",
-                                                        "clli": "NodeA",
-                                                        "service-format": "ODU",
-                                                        "node-id": "XPDR-A2",
-                                                        "tx-direction": {"port": {"port-device-name": "XPDR-A2-XPDR2"}}
-                                                        },
-                                                       {"service-rate": "400",
-                                                        "clli": "NodeC",
-                                                        "service-format": "ODU",
-                                                        "node-id": "XPDR-C2",
-                                                        "tx-direction": {"port": {"port-device-name": "XPDR-C2-XPDR2"}}
-                                                        })
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.path_computation_input_data["service-name"] = "service-ODUC4"
+        self.path_computation_input_data["service-a-end"]["service-format"] = "ODU"
+        self.path_computation_input_data["service-a-end"]["tx-direction"] = \
+            {"port": {"port-device-name": "XPDR-A2-XPDR2"}}
+        self.path_computation_input_data["service-z-end"]["service-format"] = "ODU"
+        self.path_computation_input_data["service-z-end"]["tx-direction"] = \
+            {"port": {"port-device-name": "XPDR-C2-XPDR2"}}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
  
-        self.assertEqual(400, res['output']['response-parameters']['path-description']
+        self.assertEqual(400, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['rate'])
-        self.assertEqual('dp-qam16', res['output']['response-parameters']['path-description']
+        self.assertEqual('dp-qam16', response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['modulation-format'])
  
-        self.assertEqual(400, res['output']['response-parameters']['path-description']
+        self.assertEqual(400, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['rate'])
-        self.assertEqual('dp-qam16', res['output']['response-parameters']['path-description']
+        self.assertEqual('dp-qam16', response['output']['response-parameters']['path-description']
                           ['zToA-direction']['modulation-format'])
-        time.sleep(5)
+        time.sleep(2)
  
      # Load otn topology with OTUC4 links
      def test_08_load_oduc4_otn_topology_bi(self):
-        response = test_utils.put_jsonrequest(test_utils.URL_CONFIG_OTN_TOPO, self.oduc4_otn_topo_bi_dir_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(2)
+        response = test_utils_rfc8040.put_ietf_network('otn-topology', self.oduc4_otn_topo_bi_dir_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Path Computation success
      def test_09_path_computation_100G_xpdr_bi(self):
-        response = test_utils.path_computation_request("request-1", "service-100GE",
-                                                       {"service-rate": "100",
-                                                        "clli": "NodeA",
-                                                        "service-format": "Ethernet",
-                                                        "node-id": "XPDR-A2",
-                                                        "tx-direction": {"port": {"port-device-name": "XPDR-A2-XPDR2",
-                                                                                  "port-name": "XPDR2-CLIENT1"}}},
-                                                       {"service-rate": "100",
-                                                        "clli": "NodeC",
-                                                        "service-format": "Ethernet",
-                                                        "node-id": "XPDR-C2",
-                                                        "tx-direction": {"port": {"port-device-name": "XPDR-C2-XPDR2",
-                                                                                  "port-name": "XPDR2-CLIENT1"}}})
-
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
+        self.path_computation_input_data["service-name"] = "service-100GE"
+        self.path_computation_input_data["service-a-end"]["service-rate"] = "100"
+        self.path_computation_input_data["service-a-end"]["service-format"] = "Ethernet"
+        self.path_computation_input_data["service-a-end"]["tx-direction"] = \
+            {"port": {"port-device-name": "XPDR-A2-XPDR2",
+                      "port-name": "XPDR2-CLIENT1"}}
+        self.path_computation_input_data["service-z-end"]["service-rate"] = "100"
+        self.path_computation_input_data["service-z-end"]["service-format"] = "Ethernet"
+        self.path_computation_input_data["service-z-end"]["tx-direction"] = \
+            {"port": {"port-device-name": "XPDR-C2-XPDR2",
+                      "port-name": "XPDR2-CLIENT1"}}
+        self.path_computation_input_data["service-z-end"]["service-format"] = "ODU"
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
          self.assertIn('Path is calculated',
-                      res['output']['configuration-response-common']['response-message'])
+                      response['output']['configuration-response-common']['response-message'])
  
-        self.assertEqual(100, res['output']['response-parameters']['path-description']
+        self.assertEqual(100, response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['rate'])
-        self.assertEqual('1.1', res['output']['response-parameters']['path-description']
+        self.assertEqual('1.1', response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['min-trib-slot'])
-        self.assertEqual('1.20', res['output']['response-parameters']['path-description']
+        self.assertEqual('1.20', response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['max-trib-slot'])
-        self.assertEqual('dp-qpsk', res['output']['response-parameters']['path-description']
+        self.assertEqual('dp-qpsk', response['output']['response-parameters']['path-description']
                           ['aToZ-direction']['modulation-format'])
  
-        self.assertEqual(100, res['output']['response-parameters']['path-description']
+        self.assertEqual(100, response['output']['response-parameters']['path-description']
                           ['zToA-direction']['rate'])
-        self.assertEqual('1.1', res['output']['response-parameters']['path-description']
+        self.assertEqual('1.1', response['output']['response-parameters']['path-description']
                           ['zToA-direction']['min-trib-slot'])
-        self.assertEqual('1.20', res['output']['response-parameters']['path-description']
+        self.assertEqual('1.20', response['output']['response-parameters']['path-description']
                           ['zToA-direction']['max-trib-slot'])
-        self.assertEqual('dp-qpsk', res['output']['response-parameters']['path-description']
+        self.assertEqual('dp-qpsk', response['output']['response-parameters']['path-description']
                           ['zToA-direction']['modulation-format'])
-        time.sleep(5)
+        time.sleep(2)
  
  
  if __name__ == "__main__":
diff --git a/tests/transportpce_tests/pce/test03_gnpy.py b/tests/transportpce_tests/pce/test03_gnpy.py

index 5a72ca754511491e8bdc79a984b6e85d4904a4ad..9b0a3be168f3e79ea48426d88fbe71a44752c06e 100644 (file)
--- a/tests/transportpce_tests/pce/test03_gnpy.py
+++ b/tests/transportpce_tests/pce/test03_gnpy.py
@@ -22,10 +22,30 @@ import requests
  sys.path.append('transportpce_tests/common/')
  # pylint: disable=wrong-import-position
  # pylint: disable=import-error
-import test_utils  # nopep8
+import test_utils_rfc8040  # nopep8
  
  
  class TransportGNPYtesting(unittest.TestCase):
+    path_computation_input_data = {
+        "service-name": "service-1",
+        "resource-reserve": "true",
+        "service-handler-header": {
+            "request-id": "request-1"
+        },
+        "service-a-end": {
+            "service-rate": "100",
+            "clli": "Node1",
+            "service-format": "Ethernet",
+            "node-id": "XPONDER-1"
+        },
+        "service-z-end": {
+            "service-rate": "100",
+            "clli": "Node5",
+            "service-format": "Ethernet",
+            "node-id": "XPONDER-5"
+        },
+        "pce-routing-metric": "hop-count"
+    }
  
      topo_cllinet_data = None
      topo_ordnet_data = None
@@ -73,160 +93,138 @@ class TransportGNPYtesting(unittest.TestCase):
          with open('gnpy.log', 'w', encoding='utf-8') as outfile:
              print('starting GNPy REST server...')
              # pylint: disable=consider-using-with
-            test_utils.process_list.append(subprocess.Popen(
+            test_utils_rfc8040.process_list.append(subprocess.Popen(
                  ['gnpy-rest'], stdout=outfile, stderr=outfile, stdin=None))
-        cls.processes = test_utils.start_tpce()
+        cls.processes = test_utils_rfc8040.start_tpce()
  
      @classmethod
      def tearDownClass(cls):
+        # clean datastores
+        test_utils_rfc8040.del_portmapping()
+        test_utils_rfc8040.del_ietf_network('openroadm-topology')
+        test_utils_rfc8040.del_ietf_network('openroadm-network')
+        test_utils_rfc8040.del_ietf_network('clli-network')
          # pylint: disable=not-an-iterable
          for process in cls.processes:
-            test_utils.shutdown_process(process)
+            test_utils_rfc8040.shutdown_process(process)
          print("all processes killed")
  
      def setUp(self):
-        time.sleep(2)
+        time.sleep(1)
  
       # Load port mapping
      def test_00_load_port_mapping(self):
-        response = test_utils.rawpost_request(test_utils.URL_FULL_PORTMAPPING, self.port_mapping_data)
-        self.assertEqual(response.status_code, requests.codes.no_content)
-        time.sleep(2)
+        response = test_utils_rfc8040.post_portmapping(self.port_mapping_data)
+        self.assertIn(response['status_code'], (requests.codes.created, requests.codes.no_content))
+        time.sleep(1)
  
      # Mount the different topologies
      def test_01_connect_clliNetwork(self):
-        response = test_utils.rawput_request(test_utils.URL_CONFIG_CLLI_NET, self.topo_cllinet_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(3)
+        response = test_utils_rfc8040.put_ietf_network('clli-network', self.topo_cllinet_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      def test_02_connect_openroadmNetwork(self):
-        response = test_utils.rawput_request(test_utils.URL_CONFIG_ORDM_NET, self.topo_ordnet_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(3)
+        response = test_utils_rfc8040.put_ietf_network('openroadm-network', self.topo_ordnet_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      def test_03_connect_openroadmTopology(self):
-        response = test_utils.rawput_request(test_utils.URL_CONFIG_ORDM_TOPO, self.topo_ordtopo_data)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(3)
+        response = test_utils_rfc8040.put_ietf_network('openroadm-topology', self.topo_ordtopo_data)
+        self.assertIn(response['status_code'], (requests.codes.ok, requests.codes.no_content))
+        time.sleep(1)
  
      # Path computed by PCE is feasible according to Gnpy
      def test_04_path_computation_FeasibleWithPCE(self):
-        response = test_utils.path_computation_request("request-1", "service-1",
-                                                       {"node-id": "XPONDER-1", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "Node1"},
-                                                       {"node-id": "XPONDER-5", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "Node5"})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['configuration-response-common'][
-            'response-code'], '200')
-        self.assertEqual(res['output']['configuration-response-common'][
-            'response-message'],
-            'Path is calculated by PCE')
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['configuration-response-common']['response-code'], '200')
+        self.assertEqual(response['output']['configuration-response-common']['response-message'],
+                         'Path is calculated by PCE')
          self.assertIn('A-to-Z',
-                      [res['output']['gnpy-response'][0]['path-dir'],
-                       res['output']['gnpy-response'][1]['path-dir']])
+                      [response['output']['gnpy-response'][0]['path-dir'],
+                       response['output']['gnpy-response'][1]['path-dir']])
          self.assertIn('Z-to-A',
-                      [res['output']['gnpy-response'][0]['path-dir'],
-                       res['output']['gnpy-response'][1]['path-dir']])
-        self.assertEqual(res['output']['gnpy-response'][0]['feasibility'], True)
-        self.assertEqual(res['output']['gnpy-response'][1]['feasibility'], True)
-        time.sleep(5)
+                      [response['output']['gnpy-response'][0]['path-dir'],
+                       response['output']['gnpy-response'][1]['path-dir']])
+        self.assertEqual(response['output']['gnpy-response'][0]['feasibility'], True)
+        self.assertEqual(response['output']['gnpy-response'][1]['feasibility'], True)
+        time.sleep(2)
  
      # Path computed by PCE is not feasible by GNPy and GNPy cannot find
      # another one (low SNR)
      def test_05_path_computation_FoundByPCE_NotFeasibleByGnpy(self):
-        response = test_utils.path_computation_request("request-2", "service-2",
-                                                       {"node-id": "XPONDER-1", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "Node1"},
-                                                       {"node-id": "XPONDER-5", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "Node5"},
-                                                       {"include": {"node-id": [
-                                                           "OpenROADM-2", "OpenROADM-3", "OpenROADM-4"]}})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['configuration-response-common'][
+        self.path_computation_input_data["service-name"] = "service-2"
+        self.path_computation_input_data["service-handler-header"]["request-id"] = "request-2"
+        self.path_computation_input_data["hard-constraints"] =\
+            {"include": {"node-id": ["OpenROADM-2", "OpenROADM-3", "OpenROADM-4"]}}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['configuration-response-common'][
              'response-code'], '500')
-        self.assertEqual(res['output']['configuration-response-common'][
+        self.assertEqual(response['output']['configuration-response-common'][
              'response-message'],
              'No path available by PCE and GNPy ')
          self.assertIn('A-to-Z',
-                      [res['output']['gnpy-response'][0]['path-dir'],
-                       res['output']['gnpy-response'][1]['path-dir']])
+                      [response['output']['gnpy-response'][0]['path-dir'],
+                       response['output']['gnpy-response'][1]['path-dir']])
          self.assertIn('Z-to-A',
-                      [res['output']['gnpy-response'][0]['path-dir'],
-                       res['output']['gnpy-response'][1]['path-dir']])
-        self.assertEqual(res['output']['gnpy-response'][0]['feasibility'],
+                      [response['output']['gnpy-response'][0]['path-dir'],
+                       response['output']['gnpy-response'][1]['path-dir']])
+        self.assertEqual(response['output']['gnpy-response'][0]['feasibility'],
                           False)
-        self.assertEqual(res['output']['gnpy-response'][1]['feasibility'],
+        self.assertEqual(response['output']['gnpy-response'][1]['feasibility'],
                           False)
-        time.sleep(5)
+        time.sleep(2)
  
      # #PCE cannot find a path while GNPy finds a feasible one
      def test_06_path_computation_NotFoundByPCE_FoundByGNPy(self):
-        response = test_utils.path_computation_request("request-3", "service-3",
-                                                       {"node-id": "XPONDER-1", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "Node1"},
-                                                       {"node-id": "XPONDER-4", "service-rate": "100",
-                                                           "service-format": "Ethernet", "clli": "Node5"},
-                                                       {"include": {"node-id": [
-                                                           "OpenROADM-2", "OpenROADM-3"]}})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['configuration-response-common'][
+        self.path_computation_input_data["service-name"] = "service-3"
+        self.path_computation_input_data["service-handler-header"]["request-id"] = "request-3"
+        self.path_computation_input_data["service-z-end"]["node-id"] = "XPONDER-4"
+        self.path_computation_input_data["hard-constraints"] =\
+            {"include": {"node-id": ["OpenROADM-2", "OpenROADM-3"]}}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['configuration-response-common'][
              'response-code'], '200')
-        self.assertEqual(res['output']['configuration-response-common'][
+        self.assertEqual(response['output']['configuration-response-common'][
              'response-message'],
              'Path is calculated by GNPy')
          self.assertIn('A-to-Z',
-                      [res['output']['gnpy-response'][0]['path-dir'],
-                       res['output']['gnpy-response'][1]['path-dir']])
+                      [response['output']['gnpy-response'][0]['path-dir'],
+                       response['output']['gnpy-response'][1]['path-dir']])
          self.assertIn('Z-to-A',
-                      [res['output']['gnpy-response'][0]['path-dir'],
-                       res['output']['gnpy-response'][1]['path-dir']])
-        self.assertEqual(res['output']['gnpy-response'][1]['feasibility'], True)
-        self.assertEqual(res['output']['gnpy-response'][0]['feasibility'], True)
-        time.sleep(5)
+                      [response['output']['gnpy-response'][0]['path-dir'],
+                       response['output']['gnpy-response'][1]['path-dir']])
+        self.assertEqual(response['output']['gnpy-response'][1]['feasibility'], True)
+        self.assertEqual(response['output']['gnpy-response'][0]['feasibility'], True)
+        time.sleep(2)
  
      # Not found path by PCE and GNPy cannot find another one
      def test_07_path_computation_FoundByPCE_NotFeasibleByGnpy(self):
-        response = test_utils.path_computation_request("request-4", "service-4",
-                                                       {"node-id": "XPONDER-1", "service-rate": "400",
-                                                           "service-format": "Ethernet", "clli": "Node1"},
-                                                       {"node-id": "XPONDER-4", "service-rate": "400",
-                                                           "service-format": "Ethernet", "clli": "Node4"},
-                                                       {"include": {"node-id": [
-                                                           "OpenROADM-3", "OpenROADM-2",
-                                                           "OpenROADM-5"]}})
-        self.assertEqual(response.status_code, requests.codes.ok)
-        res = response.json()
-        self.assertEqual(res['output']['configuration-response-common'][
+        self.path_computation_input_data["service-name"] = "service-4"
+        self.path_computation_input_data["service-handler-header"]["request-id"] = "request-4"
+        self.path_computation_input_data["service-a-end"]["service-rate"] = "400"
+        self.path_computation_input_data["service-z-end"]["service-rate"] = "400"
+        self.path_computation_input_data["service-z-end"]["clli"] = "Node4"
+        self.path_computation_input_data["hard-constraints"] =\
+            {"include": {"node-id": ["OpenROADM-3", "OpenROADM-2", "OpenROADM-5"]}}
+        response = test_utils_rfc8040.transportpce_api_rpc_request('transportpce-pce',
+                                                                   'path-computation-request',
+                                                                   self.path_computation_input_data)
+        self.assertEqual(response['status_code'], requests.codes.ok)
+        self.assertEqual(response['output']['configuration-response-common'][
              'response-code'], '500')
-        self.assertEqual(res['output']['configuration-response-common'][
+        self.assertEqual(response['output']['configuration-response-common'][
              'response-message'],
              'No path available by PCE and GNPy ')
-        time.sleep(5)
-
-    # Disconnect the different topologies
-    def test_08_disconnect_openroadmTopology(self):
-        response = test_utils.delete_request(test_utils.URL_CONFIG_ORDM_TOPO)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(3)
-
-    def test_09_disconnect_openroadmNetwork(self):
-        response = test_utils.delete_request(test_utils.URL_CONFIG_ORDM_NET)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(3)
-
-    def test_10_disconnect_clliNetwork(self):
-        response = test_utils.delete_request(test_utils.URL_CONFIG_CLLI_NET)
-        self.assertEqual(response.status_code, requests.codes.ok)
-        time.sleep(3)
-
-    # Delete portmapping
-    def test_11_delete_port_mapping(self):
-        response = test_utils.delete_request(test_utils.URL_FULL_PORTMAPPING)
-        self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
  
diff --git a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py

index 8c029aa1cc495ec75d4c9f1e0294951871007408..3e105a2f9e59a06447fcf3543a4bfca722f00c1e 100644 (file)
--- a/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py
+++ b/tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py
@@ -282,7 +282,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "xpdr-network"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8144/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -424,7 +425,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "xpdr-network"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8144/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -512,7 +514,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -628,7 +631,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -680,7 +684,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -796,7 +801,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -829,7 +835,8 @@ class TransportPCEFulltesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
diff --git a/tests/transportpce_tests/with_docker/test02_nbinotifications.py b/tests/transportpce_tests/with_docker/test02_nbinotifications.py

index c1436658fb98a7870cc6bb932de792cebb7fbf8e..5e5edfae16bb6324feb5c3a60d98e7cced884777 100644 (file)
--- a/tests/transportpce_tests/with_docker/test02_nbinotifications.py
+++ b/tests/transportpce_tests/with_docker/test02_nbinotifications.py
@@ -286,7 +286,8 @@ class TransportNbiNotificationstesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
@@ -318,7 +319,8 @@ class TransportNbiNotificationstesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          time.sleep(2)
  
diff --git a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py

index d66f5e240efc8c7aaaf98103ce239db3ce16a6df..ca59c8162f294f815a5c878f495f4b97056170d5 100644 (file)
--- a/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py
+++ b/tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py
@@ -352,7 +352,8 @@ class TransportNbiNotificationstesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          # If the gate fails is because of the waiting time not being enough
          time.sleep(2)
@@ -379,7 +380,8 @@ class TransportNbiNotificationstesting(unittest.TestCase):
              "port-qual": "roadm-external"}]}
          response = requests.request("PUT", url.format("http://127.0.0.1:8141/restconf"),
                                      data=json.dumps(body), headers=test_utils.TYPE_APPLICATION_JSON,
-                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD))
+                                    auth=(test_utils.ODL_LOGIN, test_utils.ODL_PWD),
+                                    timeout=test_utils.REQUEST_TIMEOUT)
          self.assertEqual(response.status_code, requests.codes.ok)
          # If the gate fails is because of the waiting time not being enough
          time.sleep(2)
diff --git a/tox.ini b/tox.ini

index 20a4e027494464428aa1bcb92f7ebccc4d3f8c43..20de1d61c5c24f9f0a3ccc2dcb4767358a7eebe5 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -61,6 +61,7 @@ depends = buildcontroller
  setenv =
      PIP_EXTRA_INDEX_URL = https://gitlab.com/api/v4/projects/33090323/packages/pypi/simple
  #    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
  deps =
    -r{toxinidir}/tests/requirements.txt
    -r{toxinidir}/tests/test-requirements.txt
@@ -68,7 +69,7 @@ deps =
    gnpy4tpce==2.4.7
  whitelist_externals = launch_tests.sh
  passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
-basepython = python3.8
+basepython = python3
  commands =
    ./launch_tests.sh pce {posargs:}
  
@@ -161,6 +162,7 @@ whitelist_externals = launch_tests.sh
  passenv = LAUNCHER USE_LIGHTY
  setenv =
  #    USE_LIGHTY=True
+#    USE_ODL_RESTCONF_VERSION=draft-bierman02
      USE_ODL_ALT_KARAF_ENV=./karaf121.env
      USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
  commands =
@@ -173,6 +175,7 @@ whitelist_externals = launch_tests.sh
  passenv = LAUNCHER USE_LIGHTY USE_ODL_RESTCONF_VERSION
  setenv =
  #    USE_LIGHTY=True
+    USE_ODL_RESTCONF_VERSION=draft-bierman02
      USE_ODL_ALT_KARAF_ENV=./karaf121.env
      USE_ODL_ALT_KARAF_INSTALL_DIR=karaf_hybrid
  commands =
@@ -195,7 +198,7 @@ setenv =
  commands =
    ./launch_tests.sh tapi {posargs:}
  
-[testenv:nbinotifications]
+[testenv:with_docker]
  depends = buildcontroller,sims221
  whitelist_externals = launch_tests.sh
                        dockercmd.sh
@@ -208,7 +211,7 @@ setenv =
  
  commands =
    ./dockercmd.sh run -d -p 2181:2181 -p 9092:9092 --env ADVERTISED_LISTENERS=PLAINTEXT://localhost:9092 --name tpce_kafka1 teivah/kafka:2.0.0
-  ./launch_tests.sh with_docker nbinotifications
+  ./launch_tests.sh with_docker {posargs:}
    ./dockercmd.sh container rm -f tpce_kafka1
  
  [testenv:docs]
@@ -231,7 +234,10 @@ whitelist_externals = sh
                        sudo
                        find
  commands =
-    sh -c 'command checkbashisms>/dev/null || sudo yum install devscripts-minimal || (echo "checkbashisms command not found - please install it (e.g. sudo apt-get install devscripts | yum install devscripts-minimal )" >&2 && exit 1)'
+    sh -c 'command checkbashisms>/dev/null || sudo yum install -y devscripts-checkbashisms || sudo yum install -y devscripts-minimal || sudo yum install -y devscripts \
+        || sudo yum install -y https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/31/Everything/x86_64/os/Packages/d/devscripts-checkbashisms-2.19.6-2.fc31.x86_64.rpm \
+        || (echo "checkbashisms command not found - please install it \
+             (e.g. sudo apt-get install devscripts | yum install devscripts-minimal )" >&2 && exit 1)'
      find . -not -path '*/\.*' -name *.sh -exec checkbashisms -f  \{\} +
  
  [testenv:spelling]
author	Guillaume Lambert <guillaume.lambert@orange.com>
	Thu, 1 Sep 2022 16:04:26 +0000 (16:04 +0000)
committer	Gerrit Code Review <gerrit@opendaylight.org>
	Thu, 1 Sep 2022 16:04:26 +0000 (16:04 +0000)
api/pom.xml		patch \| blob \| history
common/pom.xml		patch \| blob \| history
dmaap-client/pom.xml		patch \| blob \| history
features/odl-transportpce-dmaap-client/pom.xml		patch \| blob \| history
features/odl-transportpce-inventory/pom.xml		patch \| blob \| history
features/odl-transportpce-nbinotifications/pom.xml		patch \| blob \| history
features/odl-transportpce-swagger/pom.xml		patch \| blob \| history
features/odl-transportpce-tapi/pom.xml		patch \| blob \| history
features/odl-transportpce/pom.xml		patch \| blob \| history
features/pom.xml		patch \| blob \| history
inventory/pom.xml		patch \| blob \| history
karaf/pom.xml		patch \| blob \| history
nbinotifications/pom.xml		patch \| blob \| history
networkmodel/pom.xml		patch \| blob \| history
olm/pom.xml		patch \| blob \| history
ordmodels/common/pom.xml		patch \| blob \| history
ordmodels/device/pom.xml		patch \| blob \| history
ordmodels/network/pom.xml		patch \| blob \| history
ordmodels/pom.xml		patch \| blob \| history
ordmodels/service/pom.xml		patch \| blob \| history
pce/pom.xml		patch \| blob \| history
pom.xml		patch \| blob \| history
renderer/pom.xml		patch \| blob \| history
servicehandler/pom.xml		patch \| blob \| history
tapi/pom.xml		patch \| blob \| history
tapimodels/pom.xml		patch \| blob \| history
test-common/pom.xml		patch \| blob \| history
tests/sample_configs/NW-for-test-5-4.json	[new file with mode: 0644]	patch \| blob
tests/sample_configs/NW-for-test-5-4.xml	[deleted file]	patch \| blob \| history
tests/sample_configs/NW-simple-topology.json	[new file with mode: 0644]	patch \| blob
tests/sample_configs/NW-simple-topology.xml	[deleted file]	patch \| blob \| history
tests/sample_configs/honeynode-topo.json	[new file with mode: 0644]	patch \| blob
tests/sample_configs/honeynode-topo.xml	[deleted file]	patch \| blob \| history
tests/sample_configs/honeynode-topo400G.json		patch \| blob \| history
tests/sample_configs/pce_portmapping_121.json		patch \| blob \| history
tests/sample_configs/pce_portmapping_71.json		patch \| blob \| history
tests/transportpce_tests/1.2.1/test01_portmapping.py		patch \| blob \| history
tests/transportpce_tests/1.2.1/test02_topo_portmapping.py		patch \| blob \| history
tests/transportpce_tests/1.2.1/test04_renderer_service_path_nominal.py		patch \| blob \| history
tests/transportpce_tests/1.2.1/test06_end2end.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test01_portmapping.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test02_topo_portmapping.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test05_flex_grid.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test06_renderer_service_path_nominal.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test07_otn_renderer.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test08_otn_sh_renderer.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test12_end2end.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test14_otn_switch_end2end.py		patch \| blob \| history
tests/transportpce_tests/2.2.1/test15_otn_end2end_with_intermediate_switch.py		patch \| blob \| history
tests/transportpce_tests/7.1/test01_portmapping.py		patch \| blob \| history
tests/transportpce_tests/7.1/test02_otn_renderer.py		patch \| blob \| history
tests/transportpce_tests/7.1/test03_renderer_or_modes.py		patch \| blob \| history
tests/transportpce_tests/common/test_utils.py		patch \| blob \| history
tests/transportpce_tests/common/test_utils_rfc8040.py		patch \| blob \| history
tests/transportpce_tests/hybrid/test01_device_change_notifications.py		patch \| blob \| history
tests/transportpce_tests/hybrid/test02_B100G_end2end.py		patch \| blob \| history
tests/transportpce_tests/hybrid/test03_autonomous_reroute.py		patch \| blob \| history
tests/transportpce_tests/pce/test01_pce.py		patch \| blob \| history
tests/transportpce_tests/pce/test02_pce_400G.py		patch \| blob \| history
tests/transportpce_tests/pce/test03_gnpy.py		patch \| blob \| history
tests/transportpce_tests/tapi/test03_tapi_device_change_notifications.py		patch \| blob \| history
tests/transportpce_tests/with_docker/test02_nbinotifications.py		patch \| blob \| history
tests/transportpce_tests/with_docker/test03_tapi_nbinotifications.py		patch \| blob \| history
tox.ini		patch \| blob \| history