Replace tpce-topology yang by existing ordmodels

[transportpce.git] / tests / sample_configs / honeynode-topo400G.json

diff --git a/tests/sample_configs/honeynode-topo400G.json b/tests/sample_configs/honeynode-topo400G.json
index 29b0e40c53b3022f65d4aef295981a0a841ee19c..12b66cdc85b66ecc25d58c351ecab6f0b9cd3092 100644 (file)
--- a/tests/sample_configs/honeynode-topo400G.json
+++ b/tests/sample_configs/honeynode-topo400G.json
@@ -2,288 +2,604 @@
     "network": [
         {
             "network-id": "openroadm-topology",
-            "ietf-network-topology:link": [
-                {
-                    "link-id": "XPDR-C2-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP4-TXRX",
-                    "source": {
-                        "source-node": "XPDR-C2-XPDR1",
-                        "source-tp": "XPDR1-NETWORK1"
-                    },
-                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT",
-                    "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-PP4-TXRXtoXPDR-C2-XPDR1-XPDR1-NETWORK1",
-                    "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "SRG1-PP4-TXRX",
-                        "dest-node": "ROADM-C1-SRG1"
-                    }
-                },
+            "network-types": {
+                "org-openroadm-common-network:openroadm-common-network": {}
+            },
+            "node": [
                 {
-                    "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-A1-DEG2",
-                        "source-tp": "DEG2-TTP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "node-id": "ROADM-A1-SRG3",
+                    "org-openroadm-common-network:node-type": "SRG",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "DEG1-TTP-TXRX",
-                        "dest-node": "ROADM-C1-DEG1"
-                    },
-                    "org-openroadm-network-topology:OMS-attributes": {
-                        "span": {
-                            "auto-spanloss": true,
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "spanloss-base": 11.4,
-                            "link-concatenation": [
-                                {
-                                    "SRLG-Id": 0,
-                                    "fiber-type": "smf",
-                                    "pmd": 0.5,
-                                    "SRLG-length": 100000
-                                }
-                            ]
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG3-PP3-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG3-PP2-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG3-CP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP"
+                        },
+                        {
+                            "tp-id": "SRG3-PP1-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG3-PP4-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
                         }
-                    }
-                },
-                {
-                    "link-id": "XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX",
-                    "source": {
-                        "source-node": "XPDR-C1-XPDR1",
-                        "source-tp": "XPDR1-NETWORK1"
+                    ],
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
                     },
-                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT",
-                    "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1",
-                    "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "SRG1-PP1-TXRX",
-                        "dest-node": "ROADM-C1-SRG1"
-                    }
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-A1"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-C1-DEG1",
-                        "source-tp": "DEG1-CTP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "DROP-LINK",
+                    "node-id": "XPDR-A2-XPDR1",
+                    "org-openroadm-common-network:node-type": "XPONDER",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "SRG1-CP-TXRX",
-                        "dest-node": "ROADM-C1-SRG1"
-                    }
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR1-CLIENT1",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-NETWORK1"
+                            ]
+                        },
+                        {
+                            "tp-id": "XPDR1-NETWORK1",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "ROADM-A1-SRG1--SRG1-PP1-TXRX"
+                            },
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-CLIENT1"
+                            ]
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPDR-A2"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-A1-SRG3",
-                        "source-tp": "SRG3-CP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "ADD-LINK",
+                    "node-id": "XPDR-C2-XPDR1",
+                    "org-openroadm-common-network:node-type": "XPONDER",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "DEG1-CTP-TXRX",
-                        "dest-node": "ROADM-A1-DEG1"
-                    }
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR1-CLIENT1",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-NETWORK1"
+                            ]
+                        },
+                        {
+                            "tp-id": "XPDR1-NETWORK1",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "ROADM-C1-SRG1--SRG1-PP1-TXRX"
+                            },
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK",
+                            "org-openroadm-common-network:associated-connection-map-tp": [
+                                "XPDR1-CLIENT1"
+                            ]
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPDR-C2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-A1-SRG3",
-                        "source-tp": "SRG3-CP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "ADD-LINK",
+                    "node-id": "XPDR-A2-XPDR2",
+                    "org-openroadm-common-network:node-type": "XPONDER",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "DEG2-CTP-TXRX",
-                        "dest-node": "ROADM-A1-DEG2"
-                    }
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR2-NETWORK1",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "ROADM-A1-SRG1--SRG1-PP2-TXRX"
+                            },
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPDR-A2"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-A1-DEG1",
-                        "source-tp": "DEG1-CTP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "DROP-LINK",
+                    "node-id": "XPDR-C2-XPDR2",
+                    "org-openroadm-common-network:node-type": "XPONDER",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "SRG3-CP-TXRX",
-                        "dest-node": "ROADM-A1-SRG3"
-                    }
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "XPDR2-NETWORK1",
+                            "org-openroadm-network-topology:xpdr-network-attributes": {
+                                "tail-equipment-id": "ROADM-C1-SRG1--SRG1-PP2-TXRX"
+                            },
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
+                        }
+                    ],
+                    "supporting-node": [
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "XPDR-C2"
+                        },
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1",
-                    "source": {
-                        "source-node": "ROADM-A1-SRG1",
-                        "source-tp": "SRG1-PP1-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "XPONDER-INPUT",
+                    "node-id": "ROADM-C1-SRG1",
+                    "org-openroadm-common-network:node-type": "SRG",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "XPDR1-NETWORK1",
-                        "dest-node": "XPDR-A1-XPDR1"
-                    }
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP4-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP"
+                        }
+                    ],
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-C1"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-A1-SRG1-SRG1-PP4-TXRXtoXPDR-A2-XPDR1-XPDR1-NETWORK1",
-                    "source": {
-                        "source-node": "ROADM-A1-SRG1",
-                        "source-tp": "SRG1-PP4-TXRX"
+                    "node-id": "ROADM-A1-SRG1",
+                    "org-openroadm-common-network:node-type": "SRG",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "SRG1-PP4-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-PP1-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-PP2-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-PP3-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
+                        },
+                        {
+                            "tp-id": "SRG1-CP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP"
+                        }
+                    ],
+                    "org-openroadm-network-topology:srg-attributes": {
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
                     },
-                    "org-openroadm-common-network:link-type": "XPONDER-INPUT",
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-A1"
+                        }
+                    ]
+                },
+                {
+                    "node-id": "ROADM-A1-DEG1",
+                    "org-openroadm-common-network:node-type": "DEGREE",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "XPDR-A2-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP4-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "XPDR1-NETWORK1",
-                        "dest-node": "XPDR-A2-XPDR1"
-                    }
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
+                        }
+                    ],
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-A1"
+                        }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-C1-DEG1",
-                        "source-tp": "DEG1-TTP-TXRX"
+                    "node-id": "ROADM-A1-DEG2",
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-TTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
+                        }
+                    ],
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
                     },
-                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeA"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-A1"
+                        }
+                    ]
+                },
+                {
+                    "node-id": "ROADM-C1-DEG1",
+                    "org-openroadm-common-network:node-type": "DEGREE",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "DEG2-TTP-TXRX",
-                        "dest-node": "ROADM-A1-DEG2"
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG1-CTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
+                        },
+                        {
+                            "tp-id": "DEG1-TTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
+                        }
+                    ],
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 1,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
                     },
-                    "org-openroadm-network-topology:OMS-attributes": {
-                        "span": {
-                            "auto-spanloss": true,
-                            "spanloss-current": 12,
-                            "engineered-spanloss": 12.2,
-                            "spanloss-base": 11.4,
-                            "link-concatenation": [
-                                {
-                                    "SRLG-Id": 0,
-                                    "fiber-type": "smf",
-                                    "pmd": 0.5,
-                                    "SRLG-length": 100000
-                                }
-                            ]
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-C1"
                         }
-                    }
+                    ]
                 },
                 {
-                    "link-id": "ROADM-C1-SRG1-SRG1-PP4-TXRXtoXPDR-C2-XPDR1-XPDR1-NETWORK1",
+                    "node-id": "ROADM-C1-DEG2",
+                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "ietf-network-topology:termination-point": [
+                        {
+                            "tp-id": "DEG2-TTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
+                        },
+                        {
+                            "tp-id": "DEG2-CTP-TXRX",
+                            "org-openroadm-common-network:operational-state": "inService",
+                            "org-openroadm-common-network:administrative-state": "inService",
+                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
+                        }
+                    ],
+                    "org-openroadm-network-topology:degree-attributes": {
+                        "degree-number": 2,
+                        "avail-freq-maps": [
+                            {
+                                "map-name": "cband",
+                                "freq-map-granularity": 6.25,
+                                "start-edge-freq": 191.325,
+                                "effective-bits": 768,
+                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
+                            }
+                        ]
+                    },
+                    "supporting-node": [
+                        {
+                            "network-ref": "clli-network",
+                            "node-ref": "NodeC"
+                        },
+                        {
+                            "network-ref": "openroadm-network",
+                            "node-ref": "ROADM-C1"
+                        }
+                    ]
+                }
+            ],
+            "ietf-network-topology:link": [
+                {
+                    "link-id": "ROADM-A1-SRG1-SRG1-PP2-TXRXtoXPDR-A2-XPDR2-XPDR2-NETWORK1",
                     "source": {
-                        "source-node": "ROADM-C1-SRG1",
-                        "source-tp": "SRG1-PP4-TXRX"
+                        "source-node": "ROADM-A1-SRG1",
+                        "source-tp": "SRG1-PP2-TXRX"
                     },
                     "org-openroadm-common-network:link-type": "XPONDER-INPUT",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "XPDR-C2-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP4-TXRX",
+                    "org-openroadm-common-network:opposite-link": "XPDR-A2-XPDR2-XPDR2-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "XPDR1-NETWORK1",
-                        "dest-node": "XPDR-C2-XPDR1"
+                        "dest-tp": "XPDR2-NETWORK1",
+                        "dest-node": "XPDR-A2-XPDR2"
                     }
                 },
                 {
-                    "link-id": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
+                    "link-id": "ROADM-C1-SRG1-SRG1-PP2-TXRXtoXPDR-C2-XPDR2-XPDR2-NETWORK1",
                     "source": {
-                        "source-node": "ROADM-C1-DEG2",
-                        "source-tp": "DEG2-CTP-TXRX"
+                        "source-node": "ROADM-C1-SRG1",
+                        "source-tp": "SRG1-PP2-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "XPDR-C2-XPDR2-XPDR2-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "DEG1-CTP-TXRX",
-                        "dest-node": "ROADM-C1-DEG1"
+                        "dest-tp": "XPDR2-NETWORK1",
+                        "dest-node": "XPDR-C2-XPDR2"
                     }
                 },
                 {
-                    "link-id": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
+                    "link-id": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX",
                     "source": {
-                        "source-node": "ROADM-C1-DEG2",
-                        "source-tp": "DEG2-CTP-TXRX"
+                        "source-node": "ROADM-A1-DEG2",
+                        "source-tp": "DEG2-TTP-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "DROP-LINK",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "SRG1-CP-TXRX",
-                        "dest-node": "ROADM-C1-SRG1"
+                        "dest-tp": "DEG1-TTP-TXRX",
+                        "dest-node": "ROADM-C1-DEG1"
+                    },
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "auto-spanloss": true,
+                            "spanloss-current": 12,
+                            "engineered-spanloss": 12.2,
+                            "spanloss-base": 11.4,
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": 0.5,
+                                    "SRLG-length": 100000
+                                }
+                            ]
+                        }
                     }
                 },
                 {
-                    "link-id": "XPDR-A2-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP4-TXRX",
+                    "link-id": "XPDR-A2-XPDR2-XPDR2-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX",
                     "source": {
-                        "source-node": "XPDR-A2-XPDR1",
-                        "source-tp": "XPDR1-NETWORK1"
+                        "source-node": "XPDR-A2-XPDR2",
+                        "source-tp": "XPDR2-NETWORK1"
                     },
                     "org-openroadm-common-network:link-type": "XPONDER-OUTPUT",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-PP4-TXRXtoXPDR-A2-XPDR1-XPDR1-NETWORK1",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-PP2-TXRXtoXPDR-A2-XPDR2-XPDR2-NETWORK1",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "SRG1-PP4-TXRX",
+                        "dest-tp": "SRG1-PP2-TXRX",
                         "dest-node": "ROADM-A1-SRG1"
                     }
                 },
                 {
-                    "link-id": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
+                    "link-id": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
                     "source": {
-                        "source-node": "ROADM-A1-DEG2",
-                        "source-tp": "DEG2-CTP-TXRX"
+                        "source-node": "ROADM-C1-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
                     },
                     "org-openroadm-common-network:link-type": "DROP-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
                         "dest-tp": "SRG1-CP-TXRX",
-                        "dest-node": "ROADM-A1-SRG1"
+                        "dest-node": "ROADM-C1-SRG1"
                     }
                 },
                 {
-                    "link-id": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
+                    "link-id": "ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C2-XPDR1-XPDR1-NETWORK1",
                     "source": {
-                        "source-node": "ROADM-C1-DEG1",
-                        "source-tp": "DEG1-CTP-TXRX"
+                        "source-node": "ROADM-C1-SRG1",
+                        "source-tp": "SRG1-PP1-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
+                    "org-openroadm-common-network:link-type": "XPONDER-INPUT",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "XPDR-C2-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "DEG2-CTP-TXRX",
-                        "dest-node": "ROADM-C1-DEG2"
+                        "dest-tp": "XPDR1-NETWORK1",
+                        "dest-node": "XPDR-C2-XPDR1"
                     }
                 },
                 {
-                    "link-id": "XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX",
+                    "link-id": "XPDR-A2-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX",
                     "source": {
-                        "source-node": "XPDR-A1-XPDR1",
+                        "source-node": "XPDR-A2-XPDR1",
                         "source-tp": "XPDR1-NETWORK1"
                     },
                     "org-openroadm-common-network:link-type": "XPONDER-OUTPUT",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A2-XPDR1-XPDR1-NETWORK1",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
                         "dest-tp": "SRG1-PP1-TXRX",
@@ -291,29 +607,14 @@
                     }
                 },
                 {
-                    "link-id": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-A1-DEG2",
-                        "source-tp": "DEG2-CTP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
-                    "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
-                    "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "DEG1-CTP-TXRX",
-                        "dest-node": "ROADM-A1-DEG1"
-                    }
-                },
-                {
-                    "link-id": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
+                    "link-id": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
                     "source": {
-                        "source-node": "ROADM-A1-SRG1",
-                        "source-tp": "SRG1-CP-TXRX"
+                        "source-node": "ROADM-A1-SRG3",
+                        "source-tp": "SRG3-CP-TXRX"
                     },
                     "org-openroadm-common-network:link-type": "ADD-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
                         "dest-tp": "DEG1-CTP-TXRX",
@@ -321,44 +622,29 @@
                     }
                 },
                 {
-                    "link-id": "ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1",
+                    "link-id": "ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A2-XPDR1-XPDR1-NETWORK1",
                     "source": {
-                        "source-node": "ROADM-C1-SRG1",
+                        "source-node": "ROADM-A1-SRG1",
                         "source-tp": "SRG1-PP1-TXRX"
                     },
                     "org-openroadm-common-network:link-type": "XPONDER-INPUT",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX",
+                    "org-openroadm-common-network:opposite-link": "XPDR-A2-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
                         "dest-tp": "XPDR1-NETWORK1",
-                        "dest-node": "XPDR-C1-XPDR1"
-                    }
-                },
-                {
-                    "link-id": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
-                    "source": {
-                        "source-node": "ROADM-A1-DEG2",
-                        "source-tp": "DEG2-CTP-TXRX"
-                    },
-                    "org-openroadm-common-network:link-type": "DROP-LINK",
-                    "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
-                    "org-openroadm-common-network:administrative-state": "inService",
-                    "destination": {
-                        "dest-tp": "SRG3-CP-TXRX",
-                        "dest-node": "ROADM-A1-SRG3"
+                        "dest-node": "XPDR-A2-XPDR1"
                     }
                 },
                 {
-                    "link-id": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
+                    "link-id": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
                     "source": {
-                        "source-node": "ROADM-A1-SRG1",
-                        "source-tp": "SRG1-CP-TXRX"
+                        "source-node": "ROADM-A1-SRG3",
+                        "source-tp": "SRG3-CP-TXRX"
                     },
                     "org-openroadm-common-network:link-type": "ADD-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
                         "dest-tp": "DEG2-CTP-TXRX",
@@ -366,44 +652,60 @@
                     }
                 },
                 {
-                    "link-id": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
+                    "link-id": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
                     "source": {
-                        "source-node": "ROADM-C1-SRG1",
-                        "source-tp": "SRG1-CP-TXRX"
+                        "source-node": "ROADM-A1-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "ADD-LINK",
+                    "org-openroadm-common-network:link-type": "DROP-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "DEG2-CTP-TXRX",
-                        "dest-node": "ROADM-C1-DEG2"
+                        "dest-tp": "SRG3-CP-TXRX",
+                        "dest-node": "ROADM-A1-SRG3"
                     }
                 },
                 {
-                    "link-id": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
+                    "link-id": "ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX",
                     "source": {
-                        "source-node": "ROADM-A1-DEG1",
-                        "source-tp": "DEG1-CTP-TXRX"
+                        "source-node": "ROADM-C1-DEG1",
+                        "source-tp": "DEG1-TTP-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "DROP-LINK",
+                    "org-openroadm-common-network:link-type": "ROADM-TO-ROADM",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "SRG1-CP-TXRX",
-                        "dest-node": "ROADM-A1-SRG1"
+                        "dest-tp": "DEG2-TTP-TXRX",
+                        "dest-node": "ROADM-A1-DEG2"
+                    },
+                    "org-openroadm-network-topology:OMS-attributes": {
+                        "span": {
+                            "auto-spanloss": true,
+                            "spanloss-current": 12,
+                            "engineered-spanloss": 12.2,
+                            "spanloss-base": 11.4,
+                            "link-concatenation": [
+                                {
+                                    "SRLG-Id": 0,
+                                    "fiber-type": "smf",
+                                    "pmd": 0.5,
+                                    "SRLG-length": 100000
+                                }
+                            ]
+                        }
                     }
                 },
                 {
-                    "link-id": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
+                    "link-id": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
                     "source": {
-                        "source-node": "ROADM-C1-SRG1",
-                        "source-tp": "SRG1-CP-TXRX"
+                        "source-node": "ROADM-C1-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "ADD-LINK",
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
                         "dest-tp": "DEG1-CTP-TXRX",
@@ -411,537 +713,199 @@
                     }
                 },
                 {
-                    "link-id": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
+                    "link-id": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
                     "source": {
-                        "source-node": "ROADM-A1-DEG1",
-                        "source-tp": "DEG1-CTP-TXRX"
+                        "source-node": "ROADM-C1-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
                     },
-                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
+                    "org-openroadm-common-network:link-type": "DROP-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
                     "destination": {
-                        "dest-tp": "DEG2-CTP-TXRX",
-                        "dest-node": "ROADM-A1-DEG2"
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADM-C1-SRG1"
                     }
-                }
-            ],
-            "network-types": {
-                "org-openroadm-common-network:openroadm-common-network": {}
-            },
-            "node": [
+                },
                 {
-                    "node-id": "ROADM-A1-SRG3",
-                    "org-openroadm-common-network:node-type": "SRG",
-                    "org-openroadm-common-network:operational-state": "inService",
-                    "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:srg-attributes": {
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
-                    },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "SRG3-PP3-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG3-PP2-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG3-CP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP"
-                        },
-                        {
-                            "tp-id": "SRG3-PP1-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG3-PP4-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeA"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-A1"
-                        }
-                    ]
+                    "link-id": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "DROP-LINK",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "destination": {
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADM-A1-SRG1"
+                    }
                 },
                 {
-                    "node-id": "XPDR-A2-XPDR1",
-                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "link-id": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-C1-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "XPDR1-CLIENT1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
-                        },
-                        {
-                            "tp-id": "XPDR1-NETWORK1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1",
-                            "org-openroadm-network-topology:xpdr-network-attributes": {
-                                "tail-equipment-id": "ROADM-A1-SRG1--SRG1-PP4-TXRX"
-                            },
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeA"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "XPDR-A2"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADM-C1-DEG2"
+                    }
                 },
                 {
-                    "node-id": "XPDR-C2-XPDR1",
-                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "link-id": "XPDR-C2-XPDR2-XPDR2-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX",
+                    "source": {
+                        "source-node": "XPDR-C2-XPDR2",
+                        "source-tp": "XPDR2-NETWORK1"
+                    },
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-PP2-TXRXtoXPDR-C2-XPDR2-XPDR2-NETWORK1",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "XPDR1-CLIENT1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
-                        },
-                        {
-                            "tp-id": "XPDR1-NETWORK1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1",
-                            "org-openroadm-network-topology:xpdr-network-attributes": {
-                                "tail-equipment-id": "ROADM-C1-SRG1--SRG1-PP4-TXRX"
-                            },
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "XPDR-C2"
-                        },
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeC"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "SRG1-PP2-TXRX",
+                        "dest-node": "ROADM-C1-SRG1"
+                    }
                 },
                 {
-                    "node-id": "XPDR-C1-XPDR1",
-                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "link-id": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "XPDR1-CLIENT1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
-                        },
-                        {
-                            "tp-id": "XPDR1-CLIENT2",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK2",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
-                        },
-                        {
-                            "tp-id": "XPDR1-NETWORK2",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT2",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
-                        },
-                        {
-                            "tp-id": "XPDR1-NETWORK1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1",
-                            "org-openroadm-network-topology:xpdr-network-attributes": {
-                                "tail-equipment-id": "ROADM-C1-SRG1--SRG1-PP1-TXRX"
-                            },
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeC"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "XPDR-C1"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADM-A1-DEG1"
+                    }
                 },
                 {
-                    "node-id": "ROADM-C1-SRG1",
-                    "org-openroadm-common-network:node-type": "SRG",
+                    "link-id": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "ADD-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:srg-attributes": {
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
-                    },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "SRG1-PP4-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-PP1-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-PP2-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-PP3-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-CP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeC"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-C1"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADM-A1-DEG1"
+                    }
                 },
                 {
-                    "node-id": "ROADM-A1-SRG1",
-                    "org-openroadm-common-network:node-type": "SRG",
+                    "link-id": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-DEG2",
+                        "source-tp": "DEG2-CTP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "DROP-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:srg-attributes": {
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
-                    },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "SRG1-PP4-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-PP1-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-PP2-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-PP3-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-PP"
-                        },
-                        {
-                            "tp-id": "SRG1-CP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "SRG-TXRX-CP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeA"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-A1"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "SRG3-CP-TXRX",
+                        "dest-node": "ROADM-A1-SRG3"
+                    }
                 },
                 {
-                    "node-id": "ROADM-A1-DEG1",
-                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "link-id": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "ADD-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number": 1,
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
-                    },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "DEG1-CTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
-                        },
-                        {
-                            "tp-id": "DEG1-TTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeA"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-A1"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADM-A1-DEG2"
+                    }
                 },
                 {
-                    "node-id": "ROADM-A1-DEG2",
-                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "link-id": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-C1-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "ADD-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number": 2,
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
-                    },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "DEG2-TTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
-                        },
-                        {
-                            "tp-id": "DEG2-CTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeA"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-A1"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADM-C1-DEG2"
+                    }
                 },
                 {
-                    "node-id": "XPDR-A1-XPDR1",
-                    "org-openroadm-common-network:node-type": "XPONDER",
+                    "link-id": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "DROP-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "XPDR1-CLIENT1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK1",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
-                        },
-                        {
-                            "tp-id": "XPDR1-CLIENT2",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-NETWORK2",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-CLIENT"
-                        },
-                        {
-                            "tp-id": "XPDR1-NETWORK2",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT2",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
-                        },
-                        {
-                            "tp-id": "XPDR1-NETWORK1",
-                            "transportpce-topology:associated-connection-map-port": "XPDR1-CLIENT1",
-                            "org-openroadm-network-topology:xpdr-network-attributes": {
-                                "tail-equipment-id": "ROADM-A1-SRG1--SRG1-PP1-TXRX"
-                            },
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "XPONDER-NETWORK"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "XPDR-A1"
-                        },
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeA"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "SRG1-CP-TXRX",
+                        "dest-node": "ROADM-A1-SRG1"
+                    }
                 },
                 {
-                    "node-id": "ROADM-C1-DEG1",
-                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "link-id": "ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-C1-SRG1",
+                        "source-tp": "SRG1-CP-TXRX"
+                    },
+                    "org-openroadm-common-network:link-type": "ADD-LINK",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number": 1,
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
-                    },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "DEG1-CTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
-                        },
-                        {
-                            "tp-id": "DEG1-TTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeC"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-C1"
-                        }
-                    ]
+                    "destination": {
+                        "dest-tp": "DEG1-CTP-TXRX",
+                        "dest-node": "ROADM-C1-DEG1"
+                    }
                 },
                 {
-                    "node-id": "ROADM-C1-DEG2",
-                    "org-openroadm-common-network:node-type": "DEGREE",
+                    "link-id": "XPDR-C2-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX",
+                    "source": {
+                        "source-node": "XPDR-C2-XPDR1",
+                        "source-tp": "XPDR1-NETWORK1"
+                    },
+                    "org-openroadm-common-network:link-type": "XPONDER-OUTPUT",
                     "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C2-XPDR1-XPDR1-NETWORK1",
                     "org-openroadm-common-network:administrative-state": "inService",
-                    "org-openroadm-network-topology:degree-attributes": {
-                        "degree-number": 2,
-                        "avail-freq-maps": [
-                            {
-                                "map-name": "cband",
-                                "freq-map-granularity": 6.25,
-                                "start-edge-freq": 191.325,
-                                "effective-bits": 768,
-                                "freq-map": "////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////"
-                            }
-                        ]
+                    "destination": {
+                        "dest-tp": "SRG1-PP1-TXRX",
+                        "dest-node": "ROADM-C1-SRG1"
+                    }
+                },
+                {
+                    "link-id": "ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX",
+                    "source": {
+                        "source-node": "ROADM-A1-DEG1",
+                        "source-tp": "DEG1-CTP-TXRX"
                     },
-                    "ietf-network-topology:termination-point": [
-                        {
-                            "tp-id": "DEG2-TTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-TTP"
-                        },
-                        {
-                            "tp-id": "DEG2-CTP-TXRX",
-                            "org-openroadm-common-network:operational-state": "inService",
-                            "org-openroadm-common-network:administrative-state": "inService",
-                            "org-openroadm-common-network:tp-type": "DEGREE-TXRX-CTP"
-                        }
-                    ],
-                    "supporting-node": [
-                        {
-                            "network-ref": "clli-network",
-                            "node-ref": "NodeC"
-                        },
-                        {
-                            "network-ref": "openroadm-network",
-                            "node-ref": "ROADM-C1"
-                        }
-                    ]
+                    "org-openroadm-common-network:link-type": "EXPRESS-LINK",
+                    "org-openroadm-common-network:operational-state": "inService",
+                    "org-openroadm-common-network:opposite-link": "ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX",
+                    "org-openroadm-common-network:administrative-state": "inService",
+                    "destination": {
+                        "dest-tp": "DEG2-CTP-TXRX",
+                        "dest-node": "ROADM-A1-DEG2"
+                    }
                 }
             ]
         }