diff --git a/src/nbi/Dockerfile b/src/nbi/Dockerfile
index 12b3c86747d927a11c3688322846efc6de0607c6..31b826e0133158e694efe4ded76e105d008f8e2e 100644
--- a/src/nbi/Dockerfile
+++ b/src/nbi/Dockerfile
@@ -63,9 +63,14 @@ RUN python3 -m pip install -r requirements.txt
 # Add component files into working directory
 WORKDIR /var/teraflow
 COPY src/nbi/. nbi/
-COPY src/context/. context/
-COPY src/service/. service/
-COPY src/slice/. slice/
+COPY src/context/__init__.py context/__init__.py
+COPY src/context/client/. context/client/
+COPY src/device/__init__.py device/__init__.py
+COPY src/device/client/. device/client/
+COPY src/service/__init__.py service/__init__.py
+COPY src/service/client/. service/client/
+COPY src/slice/__init__.py slice/__init__.py
+COPY src/slice/client/. slice/client/
 RUN mkdir -p /var/teraflow/tests/tools
 COPY src/tests/tools/mock_osm/. tests/tools/mock_osm/
 
diff --git a/src/nbi/tests/data/test-ietf-network-huawei.json b/src/nbi/tests/data/test-ietf-network-huawei.json
deleted file mode 100644
index 37bf8e57b964c766b5e145da52ad6a489e02c06e..0000000000000000000000000000000000000000
--- a/src/nbi/tests/data/test-ietf-network-huawei.json
+++ /dev/null
@@ -1,1944 +0,0 @@
-{
-    "ietf-network:networks": {
-        "network": [
-            {
-                "network-id": "providerId-10-clientId-0-topologyId-1",
-                "ietf-te-topology:te": {
-                    "name": "Huawei-Network"
-                },
-                "ietf-te-topology:te-topology-identifier": {
-                    "provider-id": 10,
-                    "client-id": 0,
-                    "topology-id": "1"
-                },
-                "network-types": {
-                    "ietf-te-topology:te-topology": {
-                        "ietf-otn-topology:otn-topology": {}
-                    }
-                },
-                "node": [
-                    {
-                        "node-id": "10.0.10.1",
-                        "ietf-te-topology:te-node-id": "10.0.10.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "OA"
-                            },
-                            "tunnel-termination-point": [
-                                {
-                                    "tunnel-tp-id": "NTAx",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "501"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    "tunnel-tp-id": "NTAw",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "500"
-                                            }
-                                        ]
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "node-id": "10.0.20.1",
-                        "ietf-te-topology:te-node-id": "10.0.20.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "P"
-                            },
-                            "tunnel-termination-point": [
-                                {
-                                    "tunnel-tp-id": "NTAx",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "501"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    "tunnel-tp-id": "NTAw",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "500"
-                                            }
-                                        ]
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "node-id": "10.0.40.1",
-                        "ietf-te-topology:te-node-id": "10.0.40.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "P"
-                            },
-                            "tunnel-termination-point": [
-                                {
-                                    "tunnel-tp-id": "NTAw",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "500"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    "tunnel-tp-id": "NTAx",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "501"
-                                            }
-                                        ]
-                                    }
-                                }
-                            ]
-                        }
-                    },
-                    {
-                        "node-id": "10.0.30.1",
-                        "ietf-te-topology:te-node-id": "10.0.30.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-te-topology:te": {
-                                    "name": "1-1-1-1-1",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "ietf-otn-topology:client-svc": {
-                                        "client-facing": false
-                                    },
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                            "switching-capability": "ietf-te-types:switching-otn",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-otn-topology:otn": {
-                                                            "odu-type": "ietf-layer1-types:ODU4"
-                                                        }
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "OE"
-                            },
-                            "tunnel-termination-point": [
-                                {
-                                    "tunnel-tp-id": "NTAw",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "500"
-                                            }
-                                        ]
-                                    }
-                                },
-                                {
-                                    "tunnel-tp-id": "NTAx",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "encoding": "ietf-te-types:lsp-encoding-oduk",
-                                    "name": "1-1-1-1-1",
-                                    "protection-type": "ietf-te-types:lsp-protection-unprotected",
-                                    "switching-capability": "ietf-te-types:switching-otn",
-                                    "local-link-connectivities": {
-                                        "local-link-connectivity": [
-                                            {
-                                                "is-allowed": true,
-                                                "link-tp-ref": "501"
-                                            }
-                                        ]
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                ],
-                "ietf-network-topology:link": [
-                    {
-                        "link-id": "10.0.10.1-501",
-                        "source": {
-                            "source-node": "10.0.10.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.20.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.10.1-501",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.10.1-500",
-                        "source": {
-                            "source-node": "10.0.10.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.40.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.10.1-500",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.20.1-501",
-                        "source": {
-                            "source-node": "10.0.20.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.10.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.20.1-501",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.20.1-500",
-                        "source": {
-                            "source-node": "10.0.20.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.30.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.20.1-500",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.40.1-500",
-                        "source": {
-                            "source-node": "10.0.40.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.10.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.40.1-500",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.40.1-501",
-                        "source": {
-                            "source-node": "10.0.40.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.30.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.40.1-501",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.30.1-500",
-                        "source": {
-                            "source-node": "10.0.30.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.20.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.30.1-500",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.30.1-501",
-                        "source": {
-                            "source-node": "10.0.30.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.40.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.30.1-501",
-                                "te-delay-metric": 1,
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-otn-topology:odulist": [
-                                            {
-                                                "odu-type": "ietf-layer1-types:ODU0",
-                                                "number": 80
-                                            }
-                                        ]
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-otn-topology:odulist": [
-                                                {
-                                                    "number": 80,
-                                                    "odu-type": "ietf-layer1-types:ODU0"
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    }
-                ]
-            },
-            {
-                "network-id": "providerId-10-clientId-0-topologyId-2",
-                "ietf-te-topology:te": {
-                    "name": "Huawei-Network"
-                },
-                "ietf-te-topology:te-topology-identifier": {
-                    "provider-id": 10,
-                    "client-id": 0,
-                    "topology-id": "2"
-                },
-                "network-types": {
-                    "ietf-te-topology:te-topology": {
-                        "ietf-eth-te-topology:eth-tran-topology": {}
-                    }
-                },
-                "node": [
-                    {
-                        "node-id": "10.0.10.1",
-                        "ietf-te-topology:te-node-id": "10.0.10.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "200",
-                                "ietf-te-topology:te-tp-id": "128.32.33.254",
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": true,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "OA"
-                            }
-                        }
-                    },
-                    {
-                        "node-id": "10.0.20.1",
-                        "ietf-te-topology:te-node-id": "10.0.20.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "P"
-                            }
-                        }
-                    },
-                    {
-                        "node-id": "10.0.40.1",
-                        "ietf-te-topology:te-node-id": "10.0.40.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "P"
-                            }
-                        }
-                    },
-                    {
-                        "node-id": "10.0.30.1",
-                        "ietf-te-topology:te-node-id": "10.0.30.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "200",
-                                "ietf-te-topology:te-tp-id": "172.10.33.254",
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": true,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "501",
-                                "ietf-te-topology:te-tp-id": 501,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "OE"
-                            }
-                        }
-                    },
-                    {
-                        "node-id": "128.32.33.5",
-                        "ietf-te-topology:te-node-id": "128.32.33.5",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": "128.32.33.2",
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                },
-                                "ietf-te-topology:te": {
-                                    "name": "endpoint:111",
-                                    "admin-status": "up",
-                                    "oper-status": "up",
-                                    "interface-switching-capability": [
-                                        {
-                                            "encoding": "ietf-te-types:lsp-encoding-ethernet",
-                                            "switching-capability": "ietf-te-types:switching-l2sc",
-                                            "max-lsp-bandwidth": [
-                                                {
-                                                    "priority": 7,
-                                                    "te-bandwidth": {
-                                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                                    }
-                                                }
-                                            ]
-                                        }
-                                    ]
-                                }
-                            },
-                            {
-                                "tp-id": "200",
-                                "ietf-te-topology:te-tp-id": 200,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": true,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            {
-                                "tp-id": "201",
-                                "ietf-te-topology:te-tp-id": 201,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": true,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "OLT",
-                                "connectivity-matrices": {
-                                    "label-restrctions": {
-                                        "label-restrction": [
-                                            {
-                                                "label-start": {
-                                                    "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 21
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                                "label-end": {
-                                                    "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 21
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            },
-                                            {
-                                                "label-start": {
-                                                    "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 31
-                                                            }
-                                                        }
-                                                    }
-                                                },
-                                                "label-end": {
-                                                    "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 31
-                                                            }
-                                                        }
-                                                    }
-                                                }
-                                            }
-                                        ]
-                                    }
-                                }
-                            }
-                        }
-                    },
-                    {
-                        "node-id": "128.32.10.1",
-                        "ietf-te-topology:te-node-id": "128.32.10.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            {
-                                "tp-id": "200",
-                                "ietf-te-topology:te-tp-id": 200,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": true,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "ONT1"
-                            }
-                        }
-                    },
-                    {
-                        "node-id": "128.32.20.1",
-                        "ietf-te-topology:te-node-id": "128.32.20.1",
-                        "ietf-network-topology:termination-point": [
-                            {
-                                "tp-id": "500",
-                                "ietf-te-topology:te-tp-id": 500,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": false,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4094"
-                                            }
-                                        }
-                                    }
-                                }
-                            },
-                            {
-                                "tp-id": "200",
-                                "ietf-te-topology:te-tp-id": 200,
-                                "ietf-eth-te-topology:eth-svc": {
-                                    "client-facing": true,
-                                    "supported-classification": {
-                                        "port-classification": true,
-                                        "vlan-classification": {
-                                            "outer-tag": {
-                                                "supported-tag-types": [
-                                                    "ietf-eth-tran-types:classify-c-vlan",
-                                                    "ietf-eth-tran-types:classify-s-vlan"
-                                                ],
-                                                "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        ],
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-node-attributes": {
-                                "admin-status": "up",
-                                "name": "ONT2"
-                            }
-                        }
-                    }
-                ],
-                "ietf-network-topology:link": [
-                    {
-                        "link-id": "10.0.10.1-200",
-                        "source": {
-                            "source-node": "10.0.10.1",
-                            "source-tp": "200"
-                        },
-                        "destination": {
-                            "dest-node": "128.32.33.5",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.10.1-200",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "128.32.33.5-500",
-                        "source": {
-                            "source-node": "128.32.33.5",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.10.1",
-                            "dest-tp": "200"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "128.32.33.5-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.10.1-501",
-                        "source": {
-                            "source-node": "10.0.10.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.20.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.10.1-501",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.10.1-500",
-                        "source": {
-                            "source-node": "10.0.10.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.40.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.10.1-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.20.1-501",
-                        "source": {
-                            "source-node": "10.0.20.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.10.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.20.1-501",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.20.1-500",
-                        "source": {
-                            "source-node": "10.0.20.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.30.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.20.1-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.40.1-501",
-                        "source": {
-                            "source-node": "10.0.40.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.30.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.40.1-501",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.40.1-500",
-                        "source": {
-                            "source-node": "10.0.40.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.10.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.40.1-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.30.1-501",
-                        "source": {
-                            "source-node": "10.0.30.1",
-                            "source-tp": "501"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.40.1",
-                            "dest-tp": "501"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.30.1-501",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "10.0.30.1-500",
-                        "source": {
-                            "source-node": "10.0.0.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "10.0.20.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "10.0.30.1-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "128.32.33.5-200",
-                        "source": {
-                            "source-node": "128.32.33.5",
-                            "source-tp": "200"
-                        },
-                        "destination": {
-                            "dest-node": "128.32.10.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "128.32.33.5-200",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "128.32.10.1-500",
-                        "source": {
-                            "source-node": "128.32.10.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "128.32.33.5",
-                            "dest-tp": "200"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "128.32.10.1-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "128.32.33.5-201",
-                        "source": {
-                            "source-node": "128.32.33.5",
-                            "source-tp": "201"
-                        },
-                        "destination": {
-                            "dest-node": "128.32.20.1",
-                            "dest-tp": "500"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "128.32.33.5-201",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    },
-                    {
-                        "link-id": "128.32.20.1-500",
-                        "source": {
-                            "source-node": "128.32.20.1",
-                            "source-tp": "500"
-                        },
-                        "destination": {
-                            "dest-node": "128.32.33.5",
-                            "dest-tp": "201"
-                        },
-                        "ietf-te-topology:te": {
-                            "oper-status": "up",
-                            "te-link-attributes": {
-                                "access-type": "point-to-point",
-                                "admin-status": "up",
-                                "name": "128.32.20.15-500",
-                                "max-link-bandwidth": {
-                                    "te-bandwidth": {
-                                        "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                    }
-                                },
-                                "unreserved-bandwidth": [
-                                    {
-                                        "priority": 7,
-                                        "te-bandwidth": {
-                                            "ietf-eth-te-topology:eth-bandwidth": 10000000
-                                        }
-                                    }
-                                ]
-                            }
-                        }
-                    }
-                ]
-            }
-        ]
-    }
-}
diff --git a/src/nbi/tests/data/test-ietf-network.json b/src/nbi/tests/data/test-ietf-network.json
index 2a09d547bc87bf2d455dd133e5fcf098c0f8bce3..7643ef53a18e0aca583189bdefe097a10c2e502d 100644
--- a/src/nbi/tests/data/test-ietf-network.json
+++ b/src/nbi/tests/data/test-ietf-network.json
@@ -1332,7 +1332,7 @@
                                                     "ietf-eth-tran-types:classify-s-vlan"
                                                 ],
                                                 "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
+                                                "vlan-range": "1-4094"
                                             }
                                         }
                                     }
@@ -1352,7 +1352,7 @@
                                                     "ietf-eth-tran-types:classify-s-vlan"
                                                 ],
                                                 "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
+                                                "vlan-range": "1-4094"
                                             }
                                         }
                                     }
@@ -1365,45 +1365,31 @@
                                 "admin-status": "up",
                                 "name": "OLT",
                                 "connectivity-matrices": {
-                                    "label-restrctions": {
-                                        "label-restrction": [
+                                    "label-restrictions": {
+                                        "label-restriction": [
                                             {
+                                                "index": 0,
                                                 "label-start": {
                                                     "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 21
-                                                            }
-                                                        }
+                                                        "ietf-eth-te-topology:vlanid": 21
                                                     }
                                                 },
                                                 "label-end": {
                                                     "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 21
-                                                            }
-                                                        }
+                                                        "ietf-eth-te-topology:vlanid": 21
                                                     }
                                                 }
                                             },
                                             {
+                                                "index": 1,
                                                 "label-start": {
                                                     "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 31
-                                                            }
-                                                        }
+                                                        "ietf-eth-te-topology:vlanid": 31
                                                     }
                                                 },
                                                 "label-end": {
                                                     "te-label": {
-                                                        "technology": {
-                                                            "ietf-eth-te-topology:eth": {
-                                                                "vlanid": 31
-                                                            }
-                                                        }
+                                                        "ietf-eth-te-topology:vlanid": 31
                                                     }
                                                 }
                                             }
@@ -1451,7 +1437,7 @@
                                                     "ietf-eth-tran-types:classify-s-vlan"
                                                 ],
                                                 "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
+                                                "vlan-range": "1-4094"
                                             }
                                         }
                                     }
@@ -1504,7 +1490,7 @@
                                                     "ietf-eth-tran-types:classify-s-vlan"
                                                 ],
                                                 "vlan-bundling": false,
-                                                "vlan-range": "1-4096"
+                                                "vlan-range": "1-4094"
                                             }
                                         }
                                     }
@@ -1812,7 +1798,7 @@
                     {
                         "link-id": "10.0.30.1-500",
                         "source": {
-                            "source-node": "10.0.0.1",
+                            "source-node": "10.0.30.1",
                             "source-tp": "500"
                         },
                         "destination": {
@@ -1952,7 +1938,7 @@
                             "te-link-attributes": {
                                 "access-type": "point-to-point",
                                 "admin-status": "up",
-                                "name": "128.32.20.15-500",
+                                "name": "128.32.20.1-500",
                                 "max-link-bandwidth": {
                                     "te-bandwidth": {
                                         "ietf-eth-te-topology:eth-bandwidth": 10000000
diff --git a/src/nbi/tests/data/topology-dummy.json b/src/nbi/tests/data/topology-dummy.json
index 3ee8bf69a7ceaf0cb7676872a1b0d520f419095f..4735bf4465220432641793ab253d94de1365c534 100644
--- a/src/nbi/tests/data/topology-dummy.json
+++ b/src/nbi/tests/data/topology-dummy.json
@@ -1,362 +1,2840 @@
 {
-    "dummy_mode": true,
-
     "contexts": [
-        {"context_id": {"context_uuid": {"uuid": "admin"}}, "name": "admin"}
-    ],
-
-    "topologies": [
-        {
-            "topology_id": {
-                "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}
-            },
-            "name": "admin"
-        },
-        {
-            "topology_id": {
-                "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
-            },
-            "name": "providerId-10-clientId-0-topologyId-1",
-            "device_ids": [
-                {"device_uuid": {"uuid": "10.0.10.1"}},
-                {"device_uuid": {"uuid": "10.0.20.1"}},
-                {"device_uuid": {"uuid": "10.0.30.1"}},
-                {"device_uuid": {"uuid": "10.0.40.1"}}
-            ]
-        },
         {
-            "topology_id": {
-                "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-2"}
+            "context_id": {
+                "context_uuid": {
+                    "uuid": "admin"
+                }
             },
-            "name": "providerId-10-clientId-0-topologyId-2",
-            "device_ids": [
-                {"device_uuid": {"uuid": "10.0.10.1"}},
-                {"device_uuid": {"uuid": "10.0.20.1"}},
-                {"device_uuid": {"uuid": "10.0.30.1"}},
-                {"device_uuid": {"uuid": "10.0.40.1"}}
+            "name": "admin",
+            "service_ids": [],
+            "slice_ids": [],
+            "topology_ids": [
+                {
+                    "context_id": {
+                        "context_uuid": {
+                            "uuid": "admin"
+                        }
+                    },
+                    "topology_uuid": {
+                        "uuid": "admin"
+                    }
+                }
             ]
         }
     ],
-
     "devices": [
         {
+            "components": [],
+            "controller_id": {},
             "device_config": {
                 "config_rules": [
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": "{\n\"endpoints\": [\n{\n\"context_uuid\": \"admin\",\n\"name\": \"mgmt\",\n\"topology_uuid\": \"admin\",\n\"type\": \"mgmt\",\n\"uuid\": \"mgmt\"\n}\n]\n}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[mgmt]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"mgmt\", \"topology_uuid\": \"admin\", \"type\": \"mgmt\", \"uuid\": \"mgmt\"}"}}
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "mgmt",
+                                        "type": "mgmt",
+                                        "uuid": "mgmt"
+                                    },
+                                    {
+                                        "name": "200",
+                                        "type": "copper",
+                                        "uuid": "200"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "optical",
+                                        "uuid": "500"
+                                    },
+                                    {
+                                        "name": "501",
+                                        "type": "optical",
+                                        "uuid": "501"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[mgmt]",
+                            "resource_value": {
+                                "name": "mgmt",
+                                "type": "mgmt",
+                                "uuid": "mgmt"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[200]",
+                            "resource_value": {
+                                "name": "200",
+                                "type": "copper",
+                                "uuid": "200"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "optical",
+                                "uuid": "500"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[501]",
+                            "resource_value": {
+                                "name": "501",
+                                "type": "optical",
+                                "uuid": "501"
+                            }
+                        }
+                    }
                 ]
             },
-            "device_drivers": [0],
+            "device_drivers": [
+                0
+            ],
             "device_endpoints": [
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "nce-t"}},
-                        "endpoint_uuid": {"uuid": "mgmt"},
-                        "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "161ad889-3839-5dfb-a4a9-95a1de8c3ad5"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "optical",
+                    "kpi_sample_types": [],
+                    "name": "500"
+                },
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "1e35cf03-d55d-5648-9cb6-fca37bfbf23a"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "200"
+                },
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "859813e0-24c1-518e-ba77-44a4f392e321"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "optical",
+                    "kpi_sample_types": [],
+                    "name": "501"
+                },
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "b72983bd-57d8-5cf8-8ec7-da9084382d7a"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "mgmt",
+                    "kpi_sample_types": [],
                     "name": "mgmt"
                 }
             ],
-            "device_id": {"device_uuid": {"uuid": "nce-t"}},
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                }
+            },
             "device_operational_status": 2,
-            "device_type": "emu-open-line-system",
-            "name": "nce-t"
+            "device_type": "emu-packet-router",
+            "name": "10.0.30.1"
         },
         {
-            "controller_id": {"device_uuid": {"uuid": "nce-t"}},
+            "components": [],
+            "controller_id": {},
             "device_config": {
                 "config_rules": [
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": "{\n\"endpoints\": [\n{\n\"context_uuid\": \"admin\",\n\"name\": \"mgmt\",\n\"topology_uuid\": \"admin\",\n\"type\": \"mgmt\",\n\"uuid\": \"mgmt\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"200\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-2\",\n\"type\": \"copper\",\n\"uuid\": \"uuid-200\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"500\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-500\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"501\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-501\"\n}\n]\n}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[mgmt]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"mgmt\", \"topology_uuid\": \"admin\", \"type\": \"mgmt\", \"uuid\": \"mgmt\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-200]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"200\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-2\", \"type\": \"copper\", \"uuid\": \"uuid-200\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-500]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"500\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-500\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-501]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"501\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-501\"}"}}
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "200",
+                                        "type": "copper",
+                                        "uuid": "200"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "copper",
+                                        "uuid": "500"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[200]",
+                            "resource_value": {
+                                "name": "200",
+                                "type": "copper",
+                                "uuid": "200"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "copper",
+                                "uuid": "500"
+                            }
+                        }
+                    }
                 ]
             },
-            "device_drivers": [0],
+            "device_drivers": [
+                0
+            ],
             "device_endpoints": [
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.30.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-200"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "207ef8a3-18fd-5a63-ac24-4a1cc6af3e92"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-2"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "copper",
+                    "kpi_sample_types": [],
                     "name": "200"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.30.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-500"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "6fad7bc2-4ce5-5794-8bf0-ddd06cde20a6"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
-                    "endpoint_type": "optical",
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
                     "name": "500"
-                },
+                }
+            ],
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                }
+            },
+            "device_operational_status": 2,
+            "device_type": "emu-packet-router",
+            "name": "128.32.10.1"
+        },
+        {
+            "components": [],
+            "controller_id": {},
+            "device_config": {
+                "config_rules": [
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "mgmt",
+                                        "type": "mgmt",
+                                        "uuid": "mgmt"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "optical",
+                                        "uuid": "500"
+                                    },
+                                    {
+                                        "name": "501",
+                                        "type": "optical",
+                                        "uuid": "501"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[mgmt]",
+                            "resource_value": {
+                                "name": "mgmt",
+                                "type": "mgmt",
+                                "uuid": "mgmt"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "optical",
+                                "uuid": "500"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[501]",
+                            "resource_value": {
+                                "name": "501",
+                                "type": "optical",
+                                "uuid": "501"
+                            }
+                        }
+                    }
+                ]
+            },
+            "device_drivers": [
+                0
+            ],
+            "device_endpoints": [
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.30.1"}},
-                        "endpoint_uuid": {"uuid": "mgmt"},
-                        "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "75e62edc-a0f9-53f9-821b-023045db1551"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
                     },
-                    "endpoint_type": "mgmt",
-                    "name": "mgmt"
+                    "endpoint_location": {},
+                    "endpoint_type": "optical",
+                    "kpi_sample_types": [],
+                    "name": "501"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.30.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-501"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "b5efeee2-5062-5d8f-ae06-f901fed7a7d7"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "optical",
-                    "name": "501"
+                    "kpi_sample_types": [],
+                    "name": "500"
+                },
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "ede34dea-6b51-5787-88d2-553fe548f540"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "mgmt",
+                    "kpi_sample_types": [],
+                    "name": "mgmt"
                 }
             ],
-            "device_id": {"device_uuid": {"uuid": "10.0.30.1"}},
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                }
+            },
             "device_operational_status": 2,
             "device_type": "emu-packet-router",
-            "name": "10.0.30.1"
+            "name": "10.0.40.1"
         },
         {
-            "controller_id": {"device_uuid": {"uuid": "nce-t"}},
+            "components": [],
+            "controller_id": {},
             "device_config": {
                 "config_rules": [
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": "{\n\"endpoints\": [\n{\n\"context_uuid\": \"admin\",\n\"name\": \"mgmt\",\n\"topology_uuid\": \"admin\",\n\"type\": \"mgmt\",\n\"uuid\": \"mgmt\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"500\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-500\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"501\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-501\"\n}\n]\n}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[mgmt]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"mgmt\", \"topology_uuid\": \"admin\", \"type\": \"mgmt\", \"uuid\": \"mgmt\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-500]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"500\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-500\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-501]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"501\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-501\"}"}}
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "200",
+                                        "type": "copper",
+                                        "uuid": "200"
+                                    },
+                                    {
+                                        "name": "201",
+                                        "type": "copper",
+                                        "uuid": "201"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "copper",
+                                        "uuid": "500"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[200]",
+                            "resource_value": {
+                                "name": "200",
+                                "type": "copper",
+                                "uuid": "200"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[201]",
+                            "resource_value": {
+                                "name": "201",
+                                "type": "copper",
+                                "uuid": "201"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "copper",
+                                "uuid": "500"
+                            }
+                        }
+                    }
                 ]
             },
-            "device_drivers": [0],
+            "device_drivers": [
+                0
+            ],
             "device_endpoints": [
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.40.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-501"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "387f7f12-3168-5c75-801e-f06c8afdbf88"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
-                    "endpoint_type": "optical",
-                    "name": "501"
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "201"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.40.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-500"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "9095f6af-6381-54fa-9a0e-b1ef5720d163"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
-                    "endpoint_type": "optical",
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
                     "name": "500"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.40.1"}},
-                        "endpoint_uuid": {"uuid": "mgmt"},
-                        "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "c6435612-3aca-590f-89ba-e606f54df474"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
                     },
-                    "endpoint_type": "mgmt",
-                    "name": "mgmt"
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "200"
                 }
             ],
-            "device_id": {"device_uuid": {"uuid": "10.0.40.1"}},
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                }
+            },
             "device_operational_status": 2,
-            "device_type": "emu-optical-roadm",
-            "name": "10.0.40.1"
+            "device_type": "emu-optical-transponder",
+            "name": "128.32.33.5"
         },
         {
-            "controller_id": {"device_uuid": {"uuid": "nce-t"}},
+            "components": [],
+            "controller_id": {},
             "device_config": {
                 "config_rules": [
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": "{\n\"endpoints\": [\n{\n\"context_uuid\": \"admin\",\n\"name\": \"mgmt\",\n\"topology_uuid\": \"admin\",\n\"type\": \"mgmt\",\n\"uuid\": \"mgmt\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"200\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-2\",\n\"type\": \"copper\",\n\"uuid\": \"uuid-200\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"500\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-500\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"501\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-501\"\n}\n]\n}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[mgmt]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"mgmt\", \"topology_uuid\": \"admin\", \"type\": \"mgmt\", \"uuid\": \"mgmt\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-200]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"200\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-2\", \"type\": \"copper\", \"uuid\": \"uuid-200\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-500]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"500\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-500\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-501]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"501\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-501\"}"}}
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "mgmt",
+                                        "type": "mgmt",
+                                        "uuid": "mgmt"
+                                    },
+                                    {
+                                        "name": "200",
+                                        "type": "copper",
+                                        "uuid": "200"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "optical",
+                                        "uuid": "500"
+                                    },
+                                    {
+                                        "name": "501",
+                                        "type": "optical",
+                                        "uuid": "501"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[mgmt]",
+                            "resource_value": {
+                                "name": "mgmt",
+                                "type": "mgmt",
+                                "uuid": "mgmt"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[200]",
+                            "resource_value": {
+                                "name": "200",
+                                "type": "copper",
+                                "uuid": "200"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "optical",
+                                "uuid": "500"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[501]",
+                            "resource_value": {
+                                "name": "501",
+                                "type": "optical",
+                                "uuid": "501"
+                            }
+                        }
+                    }
                 ]
             },
-            "device_drivers": [0],
+            "device_drivers": [
+                0
+            ],
             "device_endpoints": [
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.10.1"}},
-                        "endpoint_uuid": {"uuid": "mgmt"},
-                        "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "59e1e30f-ea65-5e04-8a91-760a648a02c6"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "mgmt",
+                    "kpi_sample_types": [],
                     "name": "mgmt"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.10.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-501"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "70cbb732-8149-59ee-939b-011828e4292b"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
-                    "endpoint_type": "optical",
-                    "name": "501"
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "200"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.10.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-200"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "a2579e11-2e86-5e53-a235-3dd6ba92bb9a"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-2"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
-                    "endpoint_type": "copper",
-                    "name": "200"
+                    "endpoint_location": {},
+                    "endpoint_type": "optical",
+                    "kpi_sample_types": [],
+                    "name": "500"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.10.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-500"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "ad2e136d-a981-5c9a-8427-07352ac03351"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "optical",
-                    "name": "500"
+                    "kpi_sample_types": [],
+                    "name": "501"
                 }
             ],
-            "device_id": {"device_uuid": {"uuid": "10.0.10.1"}},
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                }
+            },
             "device_operational_status": 2,
             "device_type": "emu-packet-router",
             "name": "10.0.10.1"
         },
         {
-            "controller_id": {"device_uuid": {"uuid": "nce-t"}},
+            "components": [],
+            "controller_id": {},
             "device_config": {
                 "config_rules": [
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": "{\n\"endpoints\": [\n{\n\"context_uuid\": \"admin\",\n\"name\": \"mgmt\",\n\"topology_uuid\": \"admin\",\n\"type\": \"mgmt\",\n\"uuid\": \"mgmt\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"500\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-500\"\n},\n{\n\"context_uuid\": \"admin\",\n\"name\": \"501\",\n\"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\",\n\"type\": \"optical\",\n\"uuid\": \"uuid-501\"\n}\n]\n}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[mgmt]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"mgmt\", \"topology_uuid\": \"admin\", \"type\": \"mgmt\", \"uuid\": \"mgmt\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-500]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"500\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-500\"}"}},
-                    {"action": "CONFIGACTION_SET", "custom": {"resource_key": "/endpoints/endpoint[uuid-501]", "resource_value": "{\"context_uuid\": \"admin\", \"name\": \"501\", \"topology_uuid\": \"providerId-10-clientId-0-topologyId-1\", \"type\": \"optical\", \"uuid\": \"uuid-501\"}"}}
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "mgmt",
+                                        "type": "mgmt",
+                                        "uuid": "mgmt"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "optical",
+                                        "uuid": "500"
+                                    },
+                                    {
+                                        "name": "501",
+                                        "type": "optical",
+                                        "uuid": "501"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[mgmt]",
+                            "resource_value": {
+                                "name": "mgmt",
+                                "type": "mgmt",
+                                "uuid": "mgmt"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "optical",
+                                "uuid": "500"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[501]",
+                            "resource_value": {
+                                "name": "501",
+                                "type": "optical",
+                                "uuid": "501"
+                            }
+                        }
+                    }
                 ]
             },
-            "device_drivers": [0],
+            "device_drivers": [
+                0
+            ],
             "device_endpoints": [
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.20.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-500"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "23c04144-5ad3-5419-8b96-cf4eb329ca96"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "optical",
-                    "name": "500"
+                    "kpi_sample_types": [],
+                    "name": "501"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.20.1"}},
-                        "endpoint_uuid": {"uuid": "uuid-501"},
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "356378dd-952b-5032-912d-37fc21284b4c"
+                        },
                         "topology_id": {
-                            "context_id": {"context_uuid": {"uuid": "admin"}},
-                            "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
                         }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "optical",
-                    "name": "501"
+                    "kpi_sample_types": [],
+                    "name": "500"
                 },
                 {
                     "endpoint_id": {
-                        "device_id": {"device_uuid": {"uuid": "10.0.20.1"}},
-                        "endpoint_uuid": {"uuid": "mgmt"},
-                        "topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "da826790-a4b0-5317-b30b-e1370918a644"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
                     },
+                    "endpoint_location": {},
                     "endpoint_type": "mgmt",
+                    "kpi_sample_types": [],
                     "name": "mgmt"
                 }
             ],
-            "device_id": {"device_uuid": {"uuid": "10.0.20.1"}},
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                }
+            },
             "device_operational_status": 2,
-            "device_type": "emu-optical-roadm",
+            "device_type": "emu-packet-router",
             "name": "10.0.20.1"
-        }
-    ],
-    
-    "links": [
-        {"link_id": {"link_uuid": {"uuid": "nce-t/mgmt==10.0.10.1/mgmt"}}, "name": "nce-t/mgmt==10.0.10.1/mgmt", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "nce-t"    }}, "endpoint_uuid": {"uuid": "mgmt"}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "mgmt"}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "nce-t/mgmt==10.0.20.1/mgmt"}}, "name": "nce-t/mgmt==10.0.20.1/mgmt", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "nce-t"    }}, "endpoint_uuid": {"uuid": "mgmt"}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "mgmt"}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "nce-t/mgmt==10.0.30.1/mgmt"}}, "name": "nce-t/mgmt==10.0.30.1/mgmt", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "nce-t"    }}, "endpoint_uuid": {"uuid": "mgmt"}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "mgmt"}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "nce-t/mgmt==10.0.40.1/mgmt"}}, "name": "nce-t/mgmt==10.0.40.1/mgmt", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "nce-t"    }}, "endpoint_uuid": {"uuid": "mgmt"}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "mgmt"}}
-        ]},
-
-        {"link_id": {"link_uuid": {"uuid": "10.0.10.1/501==10.0.20.1/501"}}, "name": "10.0.10.1-501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.20.1/501==10.0.10.1/501"}}, "name": "10.0.20.1-501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-
-        {"link_id": {"link_uuid": {"uuid": "10.0.10.1/500==10.0.40.1/500"}}, "name": "10.0.10.1-500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.40.1/500==10.0.10.1/500"}}, "name": "10.0.40.1-500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-
-        {"link_id": {"link_uuid": {"uuid": "10.0.20.1/500==10.0.30.1/500"}}, "name": "10.0.20.1-500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.30.1/500==10.0.20.1/500"}}, "name": "10.0.30.1-500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-
-        {"link_id": {"link_uuid": {"uuid": "10.0.40.1/501==10.0.30.1/501"}}, "name": "10.0.40.1-501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.30.1/501==10.0.40.1/501"}}, "name": "10.0.30.1-501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
-        ]}
+        },
+        {
+            "components": [],
+            "controller_id": {},
+            "device_config": {
+                "config_rules": [
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "eth1",
+                                        "type": "copper",
+                                        "uuid": "eth1"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[eth1]",
+                            "resource_value": {
+                                "name": "eth1",
+                                "type": "copper",
+                                "uuid": "eth1"
+                            }
+                        }
+                    }
+                ]
+            },
+            "device_drivers": [
+                0
+            ],
+            "device_endpoints": [
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "df4be2f2-a4a2-587d-b3ed-61a53cae3aa6"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "0701f406-633f-53e7-a44d-c93384745df8"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "eth1"
+                }
+            ],
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "df4be2f2-a4a2-587d-b3ed-61a53cae3aa6"
+                }
+            },
+            "device_operational_status": 2,
+            "device_type": "emu-client",
+            "name": "128.32.20.5"
+        },
+        {
+            "components": [],
+            "controller_id": {},
+            "device_config": {
+                "config_rules": [
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "200",
+                                        "type": "copper",
+                                        "uuid": "200"
+                                    },
+                                    {
+                                        "name": "500",
+                                        "type": "copper",
+                                        "uuid": "500"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[200]",
+                            "resource_value": {
+                                "name": "200",
+                                "type": "copper",
+                                "uuid": "200"
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[500]",
+                            "resource_value": {
+                                "name": "500",
+                                "type": "copper",
+                                "uuid": "500"
+                            }
+                        }
+                    }
+                ]
+            },
+            "device_drivers": [
+                0
+            ],
+            "device_endpoints": [
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "852a3fd3-3f55-5e31-865d-c52984efb186"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "500"
+                },
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "bbbec9f8-618a-591a-bc3e-c188ee31008e"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "200"
+                }
+            ],
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                }
+            },
+            "device_operational_status": 2,
+            "device_type": "emu-packet-router",
+            "name": "128.32.20.1"
+        },
+        {
+            "components": [],
+            "controller_id": {},
+            "device_config": {
+                "config_rules": [
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "eth1",
+                                        "type": "copper",
+                                        "uuid": "eth1"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[eth1]",
+                            "resource_value": {
+                                "name": "eth1",
+                                "type": "copper",
+                                "uuid": "eth1"
+                            }
+                        }
+                    }
+                ]
+            },
+            "device_drivers": [
+                0
+            ],
+            "device_endpoints": [
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "f3840f4a-6ea2-551a-8afd-0f3faa8ac1e6"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "16d56d61-63cd-5704-9d2a-5515e633b64b"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "copper",
+                    "kpi_sample_types": [],
+                    "name": "eth1"
+                }
+            ],
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "f3840f4a-6ea2-551a-8afd-0f3faa8ac1e6"
+                }
+            },
+            "device_operational_status": 2,
+            "device_type": "emu-client",
+            "name": "128.32.10.5"
+        },
+        {
+            "components": [],
+            "controller_id": {},
+            "device_config": {
+                "config_rules": [
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/address",
+                            "resource_value": "127.0.0.1"
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/port",
+                            "resource_value": 0
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "_connect/settings",
+                            "resource_value": {
+                                "endpoints": [
+                                    {
+                                        "name": "mgmt",
+                                        "type": "mgmt",
+                                        "uuid": "mgmt"
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        "action": 1,
+                        "custom": {
+                            "resource_key": "/endpoints/endpoint[mgmt]",
+                            "resource_value": {
+                                "name": "mgmt",
+                                "type": "mgmt",
+                                "uuid": "mgmt"
+                            }
+                        }
+                    }
+                ]
+            },
+            "device_drivers": [
+                0
+            ],
+            "device_endpoints": [
+                {
+                    "endpoint_id": {
+                        "device_id": {
+                            "device_uuid": {
+                                "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                            }
+                        },
+                        "endpoint_uuid": {
+                            "uuid": "086906ec-fd3b-55e1-b9bb-5a9e5bb5daff"
+                        },
+                        "topology_id": {
+                            "context_id": {
+                                "context_uuid": {
+                                    "uuid": "admin"
+                                }
+                            },
+                            "topology_uuid": {
+                                "uuid": "admin"
+                            }
+                        }
+                    },
+                    "endpoint_location": {},
+                    "endpoint_type": "mgmt",
+                    "kpi_sample_types": [],
+                    "name": "mgmt"
+                }
+            ],
+            "device_id": {
+                "device_uuid": {
+                    "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                }
+            },
+            "device_operational_status": 2,
+            "device_type": "emu-open-line-system",
+            "name": "nce-t"
+        }
+    ],
+    "dummy_mode": true,
+    "links": [
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "70cbb732-8149-59ee-939b-011828e4292b"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "9095f6af-6381-54fa-9a0e-b1ef5720d163"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "0b3d5943-c2bf-595f-a805-dc29c2be2f52"
+                }
+            },
+            "name": "10.0.10.1-200"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "b5efeee2-5062-5d8f-ae06-f901fed7a7d7"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "a2579e11-2e86-5e53-a235-3dd6ba92bb9a"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "1490e70f-472c-5e4c-8280-21c48ed03477"
+                }
+            },
+            "name": "10.0.40.1-500"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "6fad7bc2-4ce5-5794-8bf0-ddd06cde20a6"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "c6435612-3aca-590f-89ba-e606f54df474"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "18ba8eb2-342b-5a73-aeae-7288ea9bb28b"
+                }
+            },
+            "name": "128.32.10.1-500"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "207ef8a3-18fd-5a63-ac24-4a1cc6af3e92"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "f3840f4a-6ea2-551a-8afd-0f3faa8ac1e6"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "16d56d61-63cd-5704-9d2a-5515e633b64b"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "1901b0dc-1b5e-5fdf-b9ac-9168787464c1"
+                }
+            },
+            "name": "128.32.10.1-200"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "9095f6af-6381-54fa-9a0e-b1ef5720d163"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "70cbb732-8149-59ee-939b-011828e4292b"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "1afdae8b-a281-53aa-99c2-205afb8f4ee7"
+                }
+            },
+            "name": "128.32.33.5-500"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "356378dd-952b-5032-912d-37fc21284b4c"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "161ad889-3839-5dfb-a4a9-95a1de8c3ad5"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "30ca0f8f-b150-57f2-ae5e-8a6844944783"
+                }
+            },
+            "name": "10.0.20.1-500"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "23c04144-5ad3-5419-8b96-cf4eb329ca96"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "ad2e136d-a981-5c9a-8427-07352ac03351"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "34c9c6c3-0dcf-54e5-ba67-da33eb2d3c1a"
+                }
+            },
+            "name": "10.0.20.1-501"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "161ad889-3839-5dfb-a4a9-95a1de8c3ad5"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "356378dd-952b-5032-912d-37fc21284b4c"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "35801e61-45f3-564e-ad5c-09baf4aae906"
+                }
+            },
+            "name": "10.0.30.1-500"
+        },
+        {
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "086906ec-fd3b-55e1-b9bb-5a9e5bb5daff"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "ede34dea-6b51-5787-88d2-553fe548f540"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "36856920-3387-5384-b1b1-dbc9e54da226"
+                }
+            },
+            "name": "nce-t/mgmt==10.0.40.1/mgmt"
+        },
+        {
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "086906ec-fd3b-55e1-b9bb-5a9e5bb5daff"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "b72983bd-57d8-5cf8-8ec7-da9084382d7a"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "46ba12f9-dd17-5f2a-9558-e4611515a6b9"
+                }
+            },
+            "name": "nce-t/mgmt==10.0.30.1/mgmt"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "859813e0-24c1-518e-ba77-44a4f392e321"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "75e62edc-a0f9-53f9-821b-023045db1551"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "4dfe28dd-ac28-53d5-b330-1707e350d772"
+                }
+            },
+            "name": "10.0.30.1-501"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "852a3fd3-3f55-5e31-865d-c52984efb186"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "387f7f12-3168-5c75-801e-f06c8afdbf88"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "644ab377-572c-53a4-8ab5-f5cf45591d88"
+                }
+            },
+            "name": "128.32.20.1-500"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "c6435612-3aca-590f-89ba-e606f54df474"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "6fad7bc2-4ce5-5794-8bf0-ddd06cde20a6"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "661ac531-4309-58cc-b70e-2a79492c2488"
+                }
+            },
+            "name": "128.32.33.5-200"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "387f7f12-3168-5c75-801e-f06c8afdbf88"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "852a3fd3-3f55-5e31-865d-c52984efb186"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "6a236e01-853c-51d0-8915-2d09b45923b0"
+                }
+            },
+            "name": "128.32.33.5-201"
+        },
+        {
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "086906ec-fd3b-55e1-b9bb-5a9e5bb5daff"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "da826790-a4b0-5317-b30b-e1370918a644"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "6c802ae7-59d1-55e7-9498-146c465bcab5"
+                }
+            },
+            "name": "nce-t/mgmt==10.0.20.1/mgmt"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "bbbec9f8-618a-591a-bc3e-c188ee31008e"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "df4be2f2-a4a2-587d-b3ed-61a53cae3aa6"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "0701f406-633f-53e7-a44d-c93384745df8"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "6fa77ad9-e4d7-5830-bf84-ab206eff613a"
+                }
+            },
+            "name": "128.32.20.1-200"
+        },
+        {
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "086906ec-fd3b-55e1-b9bb-5a9e5bb5daff"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "59e1e30f-ea65-5e04-8a91-760a648a02c6"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "85a18715-3ce0-57f9-8025-5634fe622a06"
+                }
+            },
+            "name": "nce-t/mgmt==10.0.10.1/mgmt"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "75e62edc-a0f9-53f9-821b-023045db1551"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "859813e0-24c1-518e-ba77-44a4f392e321"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "8e8d1a2b-beae-5624-8826-9235bd73a3a8"
+                }
+            },
+            "name": "10.0.40.1-501"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "a2579e11-2e86-5e53-a235-3dd6ba92bb9a"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "b5efeee2-5062-5d8f-ae06-f901fed7a7d7"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "e9c5b57e-de50-509c-9f5a-0107ff233703"
+                }
+            },
+            "name": "10.0.10.1-500"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "df4be2f2-a4a2-587d-b3ed-61a53cae3aa6"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "0701f406-633f-53e7-a44d-c93384745df8"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "bbbec9f8-618a-591a-bc3e-c188ee31008e"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "effca6e0-acf3-5c02-ba9a-d82c17a3f006"
+                }
+            },
+            "name": "128.32.20.5-eth1"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "ad2e136d-a981-5c9a-8427-07352ac03351"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "23c04144-5ad3-5419-8b96-cf4eb329ca96"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "f45b4432-4ae2-5719-b4e8-a5e8baa1ccd2"
+                }
+            },
+            "name": "10.0.10.1-501"
+        },
+        {
+            "attributes": {
+                "total_capacity_gbps": 10.0,
+                "used_capacity_gbps": 0.0
+            },
+            "link_endpoint_ids": [
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "f3840f4a-6ea2-551a-8afd-0f3faa8ac1e6"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "16d56d61-63cd-5704-9d2a-5515e633b64b"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                },
+                {
+                    "device_id": {
+                        "device_uuid": {
+                            "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                        }
+                    },
+                    "endpoint_uuid": {
+                        "uuid": "207ef8a3-18fd-5a63-ac24-4a1cc6af3e92"
+                    },
+                    "topology_id": {
+                        "context_id": {
+                            "context_uuid": {
+                                "uuid": "admin"
+                            }
+                        },
+                        "topology_uuid": {
+                            "uuid": "admin"
+                        }
+                    }
+                }
+            ],
+            "link_id": {
+                "link_uuid": {
+                    "uuid": "fd005f34-39f5-550e-b2c0-c6e6f8c16325"
+                }
+            },
+            "name": "128.32.10.5-eth1"
+        }
+    ],
+    "topologies": [
+        {
+            "device_ids": [
+                {
+                    "device_uuid": {
+                        "uuid": "0392c251-b5d3-526b-8f3b-a3d4137829fa"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "118295c8-318a-52ec-a394-529fc4b70f2f"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "4f2234d0-a9b8-5a86-b1dd-9139d86e3925"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "97d846b3-d0ba-5b4d-b12e-a9365eda205c"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "bf749ed2-fcc4-5bfc-9116-4ea18b722069"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "cf9c4a78-f019-5023-aa0f-4fdba909473b"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "df4be2f2-a4a2-587d-b3ed-61a53cae3aa6"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "e15007fb-aae4-50d6-b686-b6dc4ae504e2"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "f3840f4a-6ea2-551a-8afd-0f3faa8ac1e6"
+                    }
+                },
+                {
+                    "device_uuid": {
+                        "uuid": "fe0dc2e8-b9ce-555f-8f28-a1a4468fabde"
+                    }
+                }
+            ],
+            "link_ids": [
+                {
+                    "link_uuid": {
+                        "uuid": "0b3d5943-c2bf-595f-a805-dc29c2be2f52"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "1490e70f-472c-5e4c-8280-21c48ed03477"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "18ba8eb2-342b-5a73-aeae-7288ea9bb28b"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "1901b0dc-1b5e-5fdf-b9ac-9168787464c1"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "1afdae8b-a281-53aa-99c2-205afb8f4ee7"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "30ca0f8f-b150-57f2-ae5e-8a6844944783"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "34c9c6c3-0dcf-54e5-ba67-da33eb2d3c1a"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "35801e61-45f3-564e-ad5c-09baf4aae906"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "36856920-3387-5384-b1b1-dbc9e54da226"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "46ba12f9-dd17-5f2a-9558-e4611515a6b9"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "4dfe28dd-ac28-53d5-b330-1707e350d772"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "644ab377-572c-53a4-8ab5-f5cf45591d88"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "661ac531-4309-58cc-b70e-2a79492c2488"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "6a236e01-853c-51d0-8915-2d09b45923b0"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "6c802ae7-59d1-55e7-9498-146c465bcab5"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "6fa77ad9-e4d7-5830-bf84-ab206eff613a"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "85a18715-3ce0-57f9-8025-5634fe622a06"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "8e8d1a2b-beae-5624-8826-9235bd73a3a8"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "e9c5b57e-de50-509c-9f5a-0107ff233703"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "effca6e0-acf3-5c02-ba9a-d82c17a3f006"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "f45b4432-4ae2-5719-b4e8-a5e8baa1ccd2"
+                    }
+                },
+                {
+                    "link_uuid": {
+                        "uuid": "fd005f34-39f5-550e-b2c0-c6e6f8c16325"
+                    }
+                }
+            ],
+            "name": "admin",
+            "topology_id": {
+                "context_id": {
+                    "context_uuid": {
+                        "uuid": "admin"
+                    }
+                },
+                "topology_uuid": {
+                    "uuid": "admin"
+                }
+            }
+        }
     ]
-}
+}
\ No newline at end of file
diff --git a/src/nbi/tests/data/topology-real.json b/src/nbi/tests/data/topology-real.json
index a5a5562fc16951e11c6461bf6c837961b7b5a46d..72f04a1df987c0d41ddbd1cd5993ae874b60f8ef 100644
--- a/src/nbi/tests/data/topology-real.json
+++ b/src/nbi/tests/data/topology-real.json
@@ -1,39 +1,10 @@
 {
     "contexts": [
-        {"context_id": {"context_uuid": {"uuid": "admin"}}, "name": "admin"}
+        {"context_id": {"context_uuid": {"uuid": "admin"}}}
     ],
 
     "topologies": [
-        {
-            "topology_id": {
-                "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}
-            },
-            "name": "admin"
-        },
-        {
-            "topology_id": {
-                "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}
-            },
-            "name": "providerId-10-clientId-0-topologyId-1",
-            "device_ids": [
-                {"device_uuid": {"uuid": "10.0.10.1"}},
-                {"device_uuid": {"uuid": "10.0.20.1"}},
-                {"device_uuid": {"uuid": "10.0.30.1"}},
-                {"device_uuid": {"uuid": "10.0.40.1"}}
-            ]
-        },
-        {
-            "topology_id": {
-                "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-2"}
-            },
-            "name": "providerId-10-clientId-0-topologyId-2",
-            "device_ids": [
-                {"device_uuid": {"uuid": "10.0.10.1"}},
-                {"device_uuid": {"uuid": "10.0.20.1"}},
-                {"device_uuid": {"uuid": "10.0.30.1"}},
-                {"device_uuid": {"uuid": "10.0.40.1"}}
-            ]
-        }
+        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
     ],
 
     "devices": [
@@ -42,55 +13,108 @@
             {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
             {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
             {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
-                {"uuid": "mgmt", "name": "mgmt", "context_uuid": "admin", "topology_uuid": "admin", "type": "mgmt"}
+                {"uuid": "mgmt", "name": "mgmt", "type": "mgmt"}
             ]}}}
         ]}},
 
-        {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "name": "OA (PE)", "device_type": "emu-packet-router",
+        {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "name": "10.0.10.1", "device_type": "emu-packet-router",
+         "controller_id": {"device_uuid": {"uuid": "nce-t"}},
          "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
             {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
             {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
             {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
-                {"uuid": "mgmt",     "name": "mgmt", "context_uuid": "admin", "topology_uuid": "admin",                                 "type": "mgmt"   },
-                {"uuid": "uuid-200", "name": "200",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-2", "type": "copper" },
-                {"uuid": "uuid-500", "name": "500",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"},
-                {"uuid": "uuid-501", "name": "501",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"}
+                {"uuid": "mgmt", "name": "mgmt", "type": "mgmt"   },
+                {"uuid": "200",  "name": "200",  "type": "copper" },
+                {"uuid": "500",  "name": "500",  "type": "optical"},
+                {"uuid": "501",  "name": "501",  "type": "optical"}
             ]}}}
         ]}},
 
-        {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "name": "P 1", "device_type": "emu-optical-roadm",
+        {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "name": "10.0.20.1", "device_type": "emu-packet-router",
+         "controller_id": {"device_uuid": {"uuid": "nce-t"}},
          "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
             {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
             {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
             {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
-                {"uuid": "mgmt",     "name": "mgmt", "context_uuid": "admin", "topology_uuid": "admin",                                 "type": "mgmt"   },
-                {"uuid": "uuid-500", "name": "500",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"},
-                {"uuid": "uuid-501", "name": "501",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"}
+                {"uuid": "mgmt", "name": "mgmt", "type": "mgmt"   },
+                {"uuid": "500",  "name": "500",  "type": "optical"},
+                {"uuid": "501",  "name": "501",  "type": "optical"}
             ]}}}
         ]}},
 
-        {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "name": "OE (PE)", "device_type": "emu-packet-router",
-        "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+        {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "name": "10.0.30.1", "device_type": "emu-packet-router",
+         "controller_id": {"device_uuid": {"uuid": "nce-t"}},
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+            {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+            {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+            {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"uuid": "mgmt", "name": "mgmt", "type": "mgmt"   },
+                {"uuid": "200",  "name": "200",  "type": "copper" },
+                {"uuid": "500",  "name": "500",  "type": "optical"},
+                {"uuid": "501",  "name": "501",  "type": "optical"}
+            ]}}}
+        ]}},
+
+        {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "name": "10.0.40.1", "device_type": "emu-packet-router",
+         "controller_id": {"device_uuid": {"uuid": "nce-t"}},
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+            {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+            {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+            {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"uuid": "mgmt", "name": "mgmt", "type": "mgmt"   },
+                {"uuid": "500",  "name": "500",  "type": "optical"},
+                {"uuid": "501",  "name": "501",  "type": "optical"}
+            ]}}}
+        ]}},
+
+        {"device_id": {"device_uuid": {"uuid": "128.32.10.5"}}, "name": "128.32.10.5", "device_type": "emu-client",
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+            {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+            {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+            {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"uuid": "eth1", "name": "eth1", "type": "copper"}
+            ]}}}
+        ]}},
+
+        {"device_id": {"device_uuid": {"uuid": "128.32.10.1"}}, "name": "128.32.10.1", "device_type": "emu-packet-router",
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+            {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+            {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+            {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"uuid": "200", "name": "200", "type": "copper"},
+                {"uuid": "500", "name": "500", "type": "copper"}
+            ]}}}
+        ]}},
+
+        {"device_id": {"device_uuid": {"uuid": "128.32.20.5"}}, "name": "128.32.20.5", "device_type": "emu-client",
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
             {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
             {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
             {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
-                {"uuid": "mgmt",     "name": "mgmt", "context_uuid": "admin", "topology_uuid": "admin",                                 "type": "mgmt"   },
-                {"uuid": "uuid-200", "name": "200",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-2", "type": "copper" },
-                {"uuid": "uuid-500", "name": "500",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"},
-                {"uuid": "uuid-501", "name": "501",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"}
+                {"uuid": "eth1", "name": "eth1", "type": "copper"}
             ]}}}
-       ]}},
-
-       {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "name": "P 2", "device_type": "emu-optical-roadm",
-       "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
-          {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
-          {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
-          {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
-              {"uuid": "mgmt",     "name": "mgmt", "context_uuid": "admin", "topology_uuid": "admin",                                 "type": "mgmt"   },
-              {"uuid": "uuid-500", "name": "500",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"},
-              {"uuid": "uuid-501", "name": "501",  "context_uuid": "admin", "topology_uuid": "providerId-10-clientId-0-topologyId-1", "type": "optical"}
-          ]}}}
-      ]}}
+        ]}},
+
+        {"device_id": {"device_uuid": {"uuid": "128.32.20.1"}}, "name": "128.32.20.1", "device_type": "emu-packet-router",
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+            {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+            {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+            {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"uuid": "200", "name": "200", "type": "copper"},
+                {"uuid": "500", "name": "500", "type": "copper"}
+            ]}}}
+        ]}},
+
+        {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "name": "128.32.33.5", "device_type": "emu-optical-transponder",
+         "device_operational_status": 1, "device_drivers": [0], "device_config": {"config_rules": [
+            {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+            {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+            {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+                {"uuid": "200", "name": "200", "type": "copper"},
+                {"uuid": "201", "name": "201", "type": "copper"},
+                {"uuid": "500", "name": "500", "type": "copper"}
+            ]}}}
+        ]}}
     ],
 
     "links": [
@@ -111,40 +135,103 @@
             {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "mgmt"}}
         ]},
 
-        {"link_id": {"link_uuid": {"uuid": "10.0.10.1/501==10.0.20.1/501"}}, "name": "10.0.10.1/501==10.0.20.1/501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "10.0.10.1-501"}}, "name": "10.0.10.1-501",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "501"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "501"}}
+        ]},
+        {"link_id": {"link_uuid": {"uuid": "10.0.20.1-501"}}, "name": "10.0.20.1-501",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "501"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "501"}}
+        ]},
+
+        {"link_id": {"link_uuid": {"uuid": "10.0.10.1-500"}}, "name": "10.0.10.1-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "500"}}
+        ]},
+        {"link_id": {"link_uuid": {"uuid": "10.0.40.1-500"}}, "name": "10.0.40.1-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "500"}}
+        ]},
+
+        {"link_id": {"link_uuid": {"uuid": "10.0.20.1-500"}}, "name": "10.0.20.1-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "500"}}
+        ]},
+        {"link_id": {"link_uuid": {"uuid": "10.0.30.1-500"}}, "name": "10.0.30.1-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "500"}}
+        ]},
+
+        {"link_id": {"link_uuid": {"uuid": "10.0.40.1-501"}}, "name": "10.0.40.1-501",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "501"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "501"}}
+        ]},
+        {"link_id": {"link_uuid": {"uuid": "10.0.30.1-501"}}, "name": "10.0.30.1-501",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "501"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "501"}}
+        ]},
+
+        {"link_id": {"link_uuid": {"uuid": "128.32.10.5-eth1"}}, "name": "128.32.10.5-eth1",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.10.5"}}, "endpoint_uuid": {"uuid": "eth1"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.10.1"}}, "endpoint_uuid": {"uuid": "200" }}
+        ]},
+        {"link_id": {"link_uuid": {"uuid": "128.32.10.1-200"}}, "name": "128.32.10.1-200",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.10.1"}}, "endpoint_uuid": {"uuid": "200" }},
+            {"device_id": {"device_uuid": {"uuid": "128.32.10.5"}}, "endpoint_uuid": {"uuid": "eth1"}}
+        ]},
+
+        {"link_id": {"link_uuid": {"uuid": "128.32.10.1-500"}}, "name": "128.32.10.1-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.10.1"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "endpoint_uuid": {"uuid": "200"}}
         ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.20.1/501==10.0.10.1/501"}}, "name": "10.0.20.1/501==10.0.10.1/501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "128.32.33.5-200"}}, "name": "128.32.33.5-200",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "endpoint_uuid": {"uuid": "200"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.10.1"}}, "endpoint_uuid": {"uuid": "500"}}
         ]},
 
-        {"link_id": {"link_uuid": {"uuid": "10.0.10.1/500==10.0.40.1/500"}}, "name": "10.0.10.1/500==10.0.40.1/500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "128.32.20.5-eth1"}}, "name": "128.32.20.5-eth1",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.20.5"}}, "endpoint_uuid": {"uuid": "eth1"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.20.1"}}, "endpoint_uuid": {"uuid": "200" }}
         ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.40.1/500==10.0.10.1/500"}}, "name": "10.0.40.1/500==10.0.10.1/500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "128.32.20.1-200"}}, "name": "128.32.20.1-200",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.20.1"}}, "endpoint_uuid": {"uuid": "200" }},
+            {"device_id": {"device_uuid": {"uuid": "128.32.20.5"}}, "endpoint_uuid": {"uuid": "eth1"}}
         ]},
 
-        {"link_id": {"link_uuid": {"uuid": "10.0.20.1/500==10.0.30.1/500"}}, "name": "10.0.20.1/500==10.0.30.1/500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "128.32.20.1-500"}}, "name": "128.32.20.1-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.20.1"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "endpoint_uuid": {"uuid": "201"}}
         ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.30.1/500==10.0.20.1/500"}}, "name": "10.0.30.1/500==10.0.20.1/500", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.20.1"}}, "endpoint_uuid": {"uuid": "uuid-500"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "128.32.33.5-201"}}, "name": "128.32.33.5-201",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "endpoint_uuid": {"uuid": "201"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.20.1"}}, "endpoint_uuid": {"uuid": "500"}}
         ]},
 
-        {"link_id": {"link_uuid": {"uuid": "10.0.40.1/501==10.0.30.1/501"}}, "name": "10.0.40.1/501==10.0.30.1/501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "128.32.33.5-500"}}, "name": "128.32.33.5-500",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "endpoint_uuid": {"uuid": "500"}},
+            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "200"}}
         ]},
-        {"link_id": {"link_uuid": {"uuid": "10.0.30.1/501==10.0.40.1/501"}}, "name": "10.0.30.1/501==10.0.40.1/501", "link_endpoint_ids": [
-            {"device_id": {"device_uuid": {"uuid": "10.0.30.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}},
-            {"device_id": {"device_uuid": {"uuid": "10.0.40.1"}}, "endpoint_uuid": {"uuid": "uuid-501"}, "topology_id": {"topology_uuid": {"uuid": "providerId-10-clientId-0-topologyId-1"}, "context_id": {"context_uuid": {"uuid": "admin"}}}}
+        {"link_id": {"link_uuid": {"uuid": "10.0.10.1-200"}}, "name": "10.0.10.1-200",
+         "attributes": {"total_capacity_gbps": 10, "used_capacity_gbps": 0}, "link_endpoint_ids": [
+            {"device_id": {"device_uuid": {"uuid": "10.0.10.1"}}, "endpoint_uuid": {"uuid": "200"}},
+            {"device_id": {"device_uuid": {"uuid": "128.32.33.5"}}, "endpoint_uuid": {"uuid": "500"}}
         ]}
     ]
 }