diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
index 177691c..ac9c2ca 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json
@@ -1,34 +1,38 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw
index 2a4a06e..31c166a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE01.json.hw
@@ -1,6 +1,17 @@
 {
+    "devices":{
+        "of:0000000000000001":{
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"10.128.13.232",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:90:fb:64:cc:9e"
+            }
+        }
+    },
     "ports":{
-        "device:tofino:leaf1/168":{
+        "of:0000000000000001/160":{
             "interfaces":[
                 {
                     "ips":[
@@ -10,7 +21,7 @@
                 }
             ]
         },
-        "device:tofino:leaf1/160":{
+        "of:0000000000000001/168":{
             "interfaces":[
                 {
                     "ips":[
@@ -20,16 +31,5 @@
                 }
             ]
         }
-    },
-    "devices":{
-        "device:tofino:leaf1":{
-            "segmentrouting":{
-                "isEdgeRouter":true,
-                "routerMac":"00:90:fb:64:cc:9e",
-                "ipv4NodeSid":201,
-                "ipv4Loopback":"10.128.13.232",
-                "adjacencySids":[]
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.json
index a43ff74..967160c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE02.json
@@ -1,80 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.json
index 6c4dc4f..ecb82fa 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE03.json
@@ -1,86 +1,94 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.json
index 7a61f60..1c010ef 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE04.json
@@ -1,176 +1,212 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.json
index 1de2582..4dc5577 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE11.json
@@ -1,46 +1,58 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/1"]
-            }
-        },
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
+    },
+    "hosts":{
+        "00:aa:00:00:00:01/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/1"
+                ]
+            }
+        },
+        "00:aa:00:00:00:02/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.json
index cbc01b9..c755a30 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE12.json
@@ -1,80 +1,106 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/10" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.json
index 88d810d..e60868e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE13.json
@@ -1,108 +1,132 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/3"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:aa:00:00:00:03/20" : {
-            "basic": {
-                "locations": ["of:0000000000000002/3"]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "00:aa:00:00:00:04/20" : {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:aa:00:00:00:01/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/3"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:02/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:03/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000002/3"
+                ]
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:04/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000002/4"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.json
index a4d51c5..efb9445 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE14.json
@@ -1,176 +1,228 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:aa:00:00:00:03/20" : {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:aa:00:00:00:04/20" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:aa:00:00:00:01/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:02/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:03/20":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:04/20":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.json
index aa67258..3980f76 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE21.json
@@ -1,36 +1,44 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.json
index afaae3e..f2ed4a4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE22.json
@@ -1,84 +1,110 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.json
index ec8021a..a00d226 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE23.json
@@ -1,90 +1,106 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.json
index c62464c..78296ed 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE24.json
@@ -1,184 +1,236 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.json
index 24b251e..c329859 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE31.json
@@ -1,35 +1,41 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.json
index 123356e..ecdc45e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE32.json
@@ -1,82 +1,104 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.json
index 291d10d..07127c7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE33.json
@@ -1,88 +1,100 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.json
index edddd01..597152c 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE34.json
@@ -1,180 +1,224 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10],
-                    "vlan-native": 20
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30],
-                    "vlan-native": 40
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-     "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-native":40,
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.json
index 6ae7b2f..1d7a9d5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE41.json
@@ -1,41 +1,49 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        }
+    },
+    "hosts":{
+        "00:aa:00:00:00:02/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.json
index 4a1fc53..97e17af 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE42.json
@@ -1,80 +1,102 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.json
index ef3177c..9285e32 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE43.json
@@ -1,98 +1,114 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:aa:00:00:00:04/20" : {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:aa:00:00:00:02/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:04/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000002/4"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.json
index e6a7c7a..fccb280 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE44.json
@@ -1,176 +1,220 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/10" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/20" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/20":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.json
index ff991d1..8f6b3db 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE51.json
@@ -1,34 +1,38 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.json
index 83317c4..49e8054 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE52.json
@@ -1,80 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.json
index 3f419f7..7908a78 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE53.json
@@ -1,86 +1,94 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.json
index dd04642..2f5d743 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE54.json
@@ -1,176 +1,212 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        }
-    },
-    "hosts": {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/None": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/None": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.json
index 9d0cf38..4e6995b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE61.json
@@ -1,46 +1,58 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10" : {
-            "basic": {
-                "locations": ["of:0000000000000001/1"]
-            }
-        },
-        "00:aa:00:00:00:02/20" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
+    },
+    "hosts":{
+        "00:aa:00:00:00:01/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/1"
+                ]
+            }
+        },
+        "00:aa:00:00:00:02/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.json
index 25f1ff4..d21e1dc 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE62.json
@@ -1,80 +1,106 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/10" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/20" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/20":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.json
index 7f6c652..97147bc 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE63.json
@@ -1,108 +1,132 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:01/10": {
-            "basic": {
-                "locations": ["of:0000000000000001/3"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:aa:00:00:00:02/20": {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:aa:00:00:00:03/30": {
-            "basic": {
-                "locations": ["of:0000000000000002/3"]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "00:aa:00:00:00:04/40": {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:aa:00:00:00:01/10":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/3"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:02/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:03/30":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000002/3"
+                ]
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:04/40":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000002/4"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.json
index 693e431..e7e4a8e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE64.json
@@ -1,176 +1,228 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [10]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/10": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6","of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/20": {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/30": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/40": {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/10":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/20":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/30":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/40":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.json
index de681a0..817c19a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE71.json
@@ -1,41 +1,49 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        }
+    },
+    "hosts":{
+        "00:aa:00:00:00:02/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/20" : {
-            "basic": {
-                "locations": ["of:0000000000000001/2"]
-            }
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.json
index 8d56d19..7ec709f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE72.json
@@ -1,80 +1,102 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/2", "of:0000000000000002/2"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/20" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/3", "of:0000000000000002/3"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/2",
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/20":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/3",
+                    "of:0000000000000002/3"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.json
index b8cb49c..7825521 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE73.json
@@ -1,98 +1,114 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:aa:00:00:00:02/20" : {
-            "basic": {
-                "locations": ["of:0000000000000001/4"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:aa:00:00:00:04/40" : {
-            "basic": {
-                "locations": ["of:0000000000000002/4"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:aa:00:00:00:02/20":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:aa:00:00:00:04/40":{
+            "basic":{
+                "locations":[
+                    "of:0000000000000002/4"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.json
index 7d34104..bf9aee2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/CASE74.json
@@ -1,176 +1,220 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        }
-    },
-    "hosts" : {
-        "00:AA:00:00:00:01/None": {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000001/6", "of:0000000000000002/6"]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:02/20" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000001/7", "of:0000000000000002/7"]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "00:AA:00:00:00:03/None": {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/6", "of:0000000000000004/6"]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "00:AA:00:00:00:04/40" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/7", "of:0000000000000004/7"]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+    "hosts":{
+        "00:AA:00:00:00:01/None":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/6",
+                    "of:0000000000000002/6"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:02/20":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/7",
+                    "of:0000000000000002/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:03/None":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/6",
+                    "of:0000000000000004/6"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+        "00:AA:00:00:00:04/40":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000004/7"
+                ]
             }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/extra.json b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/extra.json
index e3544bf..1b9bc89 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/extra.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/json/extra.json
@@ -1,16 +1,24 @@
 {
-    "hosts" : {
-        "00:00:00:00:00:09/-1" : {
-            "basic": {
-                "ips": ["10.0.1.9"],
-                "locations": ["of:0000000000000001/3"]
+    "hosts":{
+        "00:00:00:00:00:09/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.9"
+                ],
+                "locations":[
+                    "of:0000000000000001/3"
+                ]
             }
         },
-        "00:00:00:00:09:01/-1" : {
-            "basic": {
-                "ips": ["10.0.9.1"],
-                "locations": ["of:0000000000000001/4"]
+        "00:00:00:00:09:01/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.9.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
index 9293c8e..8987807 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
@@ -1,112 +1,126 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
index da60e7e..3413501 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
@@ -1,121 +1,139 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/7",
+                    "gatewayIps":[
+                        "10.0.1.1"
+                    ],
+                    "serverIps":[
+                        "10.0.99.3"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/7",
-                    "serverIps": ["10.0.99.3"],
-                    "gatewayIps": ["10.0.1.1"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
index 9293c8e..8987807 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
@@ -1,112 +1,126 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
index da60e7e..3413501 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
@@ -1,121 +1,139 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/7",
+                    "gatewayIps":[
+                        "10.0.1.1"
+                    ],
+                    "serverIps":[
+                        "10.0.99.3"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/7",
-                    "serverIps": ["10.0.99.3"],
-                    "gatewayIps": ["10.0.1.1"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
index 195d497..d29b2a0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
@@ -1,118 +1,134 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253"]
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ],
-            "indirect": [
+            "indirect":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.252"]
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.252"
+                    ]
+                }
+            ]
+        }
+    },
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
index caebe93..b3863fc 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
@@ -1,134 +1,150 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253"],
-                    "relayAgentIps": {
-                        "of:0000000000000001": {
-                            "ipv4": "10.0.2.254"
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "relayAgentIps":{
+                        "of:0000000000000001":{
+                            "ipv4":"10.0.2.254"
                         },
-                        "of:0000000000000002": {
-                            "ipv4": "10.0.3.254"
+                        "of:0000000000000002":{
+                            "ipv4":"10.0.3.254"
                         }
-                    }
+                    },
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ],
-            "indirect": [
+            "indirect":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.252"],
-                    "relayAgentIps": {
-                        "of:0000000000000001": {
-                            "ipv4": "10.0.2.254"
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "relayAgentIps":{
+                        "of:0000000000000001":{
+                            "ipv4":"10.0.2.254"
                         },
-                        "of:0000000000000002": {
-                            "ipv4": "10.0.3.254"
+                        "of:0000000000000002":{
+                            "ipv4":"10.0.3.254"
                         }
-                    }
+                    },
+                    "serverIps":[
+                        "10.0.3.252"
+                    ]
+                }
+            ]
+        }
+    },
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
index 243f283..8106d62 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
@@ -1,112 +1,129 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
index a7efeeb..07b56f3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
@@ -1,121 +1,144 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/7",
+                    "gatewayIps":[
+                        "10.0.1.1",
+                        "2000::101"
+                    ],
+                    "serverIps":[
+                        "10.0.99.3",
+                        "2000::99fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/7",
-                    "serverIps": ["10.0.99.3", "2000::99fd"],
-                    "gatewayIps": ["10.0.1.1", "2000::101"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
index 243f283..8106d62 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
@@ -1,112 +1,129 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
index a7efeeb..07b56f3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
@@ -1,121 +1,144 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/7",
+                    "gatewayIps":[
+                        "10.0.1.1",
+                        "2000::101"
+                    ],
+                    "serverIps":[
+                        "10.0.99.3",
+                        "2000::99fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/7",
-                    "serverIps": ["10.0.99.3", "2000::99fd"],
-                    "gatewayIps": ["10.0.1.1", "2000::101"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
index b478aff..5ea58c4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
@@ -1,118 +1,138 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ],
-            "indirect": [
+            "indirect":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.252", "2000::3fc"]
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.252",
+                        "2000::3fc"
+                    ]
+                }
+            ]
+        }
+    },
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
index 050781e..a43f8df 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
@@ -1,138 +1,158 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
-        }
-    },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
-                {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253", "2000::3fd"],
-                    "relayAgentIps": {
-                        "of:0000000000000001": {
-                            "ipv4": "10.0.2.254",
-                            "ipv6": "2000::2ff/120"
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "relayAgentIps":{
+                        "of:0000000000000001":{
+                            "ipv4":"10.0.2.254",
+                            "ipv6":"2000::2ff/120"
                         },
-                        "of:0000000000000002": {
-                            "ipv4": "10.0.3.254",
-                            "ipv6": "2000::3ff/120"
+                        "of:0000000000000002":{
+                            "ipv4":"10.0.3.254",
+                            "ipv6":"2000::3ff/120"
                         }
-                    }
+                    },
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ],
-            "indirect": [
+            "indirect":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.252", "2000::3fc"],
-                    "relayAgentIps": {
-                        "of:0000000000000001": {
-                            "ipv4": "10.0.2.254",
-                            "ipv6": "2000::2ff/120"
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "relayAgentIps":{
+                        "of:0000000000000001":{
+                            "ipv4":"10.0.2.254",
+                            "ipv6":"2000::2ff/120"
                         },
-                        "of:0000000000000002": {
-                            "ipv4": "10.0.3.254",
-                            "ipv6": "2000::3ff/120"
+                        "of:0000000000000002":{
+                            "ipv4":"10.0.3.254",
+                            "ipv6":"2000::3ff/120"
                         }
-                    }
+                    },
+                    "serverIps":[
+                        "10.0.3.252",
+                        "2000::3fc"
+                    ]
+                }
+            ]
+        }
+    },
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
+        }
+    },
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
index 4547dbf..c04ed9d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
@@ -1,112 +1,134 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
index 43daa02..473c4e4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
@@ -1,121 +1,147 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/7",
+                    "gatewayIps":[
+                        "10.0.1.1"
+                    ],
+                    "serverIps":[
+                        "10.0.99.3"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/7",
-                    "serverIps": ["10.0.99.3"],
-                    "gatewayIps": ["10.0.1.1"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
index 6e14ba8..61d9522 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
@@ -1,112 +1,137 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
-                    "vlan-untagged": 10
+                    "dhcpServerConnectPoint":"of:0000000000000002/5",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000002/5",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
index 6f42b53..e88eee7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
@@ -1,168 +1,188 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
+                    "dhcpServerConnectPoint":"of:0000000000000003/8",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000003/8",
-                    "serverIps": ["10.0.3.253"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
index a7ba265..8351afa 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
@@ -1,168 +1,190 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-untagged": 40
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 50
+                    "dhcpServerConnectPoint":"of:0000000000000003/8",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000003/8",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-untagged":40
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
index f1a94e1..fd29ea3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
@@ -1,168 +1,204 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-tagged": [30]
+                    "dhcpServerConnectPoint":"of:0000000000000003/8",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000003/8",
-                    "serverIps": ["10.0.3.253"]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
index 0cbde04..4ee4e9d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
@@ -1,168 +1,206 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::2ff/120" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 50
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-tagged": [50]
+                    "dhcpServerConnectPoint":"of:0000000000000003/8",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
             }
         }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000003/8",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000001/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::2ff/120"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":50
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
index e3544bf..1b9bc89 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
@@ -1,16 +1,24 @@
 {
-    "hosts" : {
-        "00:00:00:00:00:09/-1" : {
-            "basic": {
-                "ips": ["10.0.1.9"],
-                "locations": ["of:0000000000000001/3"]
+    "hosts":{
+        "00:00:00:00:00:09/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.9"
+                ],
+                "locations":[
+                    "of:0000000000000001/3"
+                ]
             }
         },
-        "00:00:00:00:09:01/-1" : {
-            "basic": {
-                "ips": ["10.0.9.1"],
-                "locations": ["of:0000000000000001/4"]
+        "00:00:00:00:09:01/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.9.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1.json
index 8c5d3fb..350e7ae 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1.json
@@ -1,16 +1,16 @@
 {
-   "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1_ports.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1_ports.json
index 84a7c08..fdabef2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1_ports.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x1_ports.json
@@ -1,36 +1,44 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2.json
index fccda9d..273ffd3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2.json
@@ -1,32 +1,32 @@
 {
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 1,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
             },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":1,
+                "routerMac":"00:00:00:00:00:01"
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2_ports.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2_ports.json
index 845230e..32c292e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2_ports.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/0x2_ports.json
@@ -1,68 +1,84 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2.json
index 0595033..9e12640 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2.json
@@ -1,86 +1,94 @@
 {
-    "ports" : {
-        "of:0000000000000002/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+    "ports":{
+        "of:0000000000000002/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2_ports.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2_ports.json
index af5cc29..4c051ad 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2_ports.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x2_ports.json
@@ -1,36 +1,44 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4.json
index 1fc65ba..7e7f9d5 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4.json
@@ -1,150 +1,166 @@
 {
-    "ports" : {
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000001",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:01"
+            }
         },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
         },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:01"
+            }
         },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 30
-                }
-            ]
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "routerMac":"00:00:00:00:01:02"
+            }
         }
     },
-    "devices" : {
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000002",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+    "ports":{
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000001",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000004",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000003",
-                "pairLocalPort" : 5,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000003/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "driver" : "ofdpa-ovs"
-            }
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
+        },
+        "of:0000000000000004/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":30
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4_ports.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4_ports.json
index 7d1eb0d..ed6b095 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4_ports.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/2x4_ports.json
@@ -1,68 +1,84 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE101.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE101.json
index 3b6fe09..0b62789 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE101.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE101.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE102.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE102.json
index 8dbc07a..78268b0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE102.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE102.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE104.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE104.json
index f111838..c320fa4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE104.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE104.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ],
-                    "vlan-native": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":20,
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE11.json
index 52760d1..74e4b39 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE11.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE11.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE111.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE111.json
index 238174c..64d7342 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE111.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE111.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE112.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE112.json
index 4bd932c..2835742 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE112.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE112.json
@@ -1,70 +1,90 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE113.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE113.json
index e9b69e1..9bab34b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE113.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE113.json
@@ -1,37 +1,47 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE114.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE114.json
index f2cbc24..c92d17b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE114.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE114.json
@@ -1,70 +1,90 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE12.json
index 0455d62..5bcdf94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE12.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE12.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE121.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE121.json
index 238174c..64d7342 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE121.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE121.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE122.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE122.json
index e592a77..c9281cf 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE122.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE122.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE123.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE123.json
index 4ae8150..7b5452a 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE123.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE123.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE124.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE124.json
index 42b47c9..4fe0ad9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE124.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE124.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE13.json
index fd61928..b600850 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE13.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE13.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE131.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE131.json
index 1c44c52..3e3d5fd 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE131.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE131.json
@@ -1,37 +1,47 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE132.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE132.json
index 4bd932c..2835742 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE132.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE132.json
@@ -1,70 +1,90 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE133.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE133.json
index e9b69e1..9bab34b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE133.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE133.json
@@ -1,37 +1,47 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE134.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE134.json
index f2cbc24..c92d17b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE134.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE134.json
@@ -1,70 +1,90 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE14.json
index e6ad09d..c258254 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE14.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE14.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE161.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE161.json
index f797c84..5bd0a4d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE161.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE161.json
@@ -1,36 +1,48 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE162.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE162.json
index 81d8251..f3419b8 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE162.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE162.json
@@ -1,68 +1,92 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE163.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE163.json
index 01c9290..23076de 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE163.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE163.json
@@ -1,36 +1,48 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE164.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE164.json
index a6d29c3..7e89415 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE164.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE164.json
@@ -1,68 +1,92 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE171.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE171.json
index 3dfa7ee..fa7a3b9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE171.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE171.json
@@ -1,36 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE172.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE172.json
index ef138fa..250e110 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE172.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE172.json
@@ -1,68 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE173.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE173.json
index 129ac73..9511a49 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE173.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE173.json
@@ -1,36 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE174.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE174.json
index 3f52458..6105053 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE174.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE174.json
@@ -1,68 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE181.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE181.json
index 3dfa7ee..fa7a3b9 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE181.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE181.json
@@ -1,36 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE182.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE182.json
index ef138fa..250e110 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE182.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE182.json
@@ -1,68 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE183.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE183.json
index 129ac73..9511a49 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE183.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE183.json
@@ -1,36 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE184.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE184.json
index 3f52458..6105053 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE184.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE184.json
@@ -1,68 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE191.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE191.json
index a2f80de..ef1b047 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE191.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE191.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE192.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE192.json
index 54a6ea6..df04704 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE192.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE192.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE193.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE193.json
index 3075a74..a6c7b55 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE193.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE193.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE194.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE194.json
index 235ce57..df3b6a2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE194.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE194.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE201.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE201.json
index a2f80de..ef1b047 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE201.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE201.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE202.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE202.json
index 54a6ea6..df04704 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE202.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE202.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE203.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE203.json
index 3075a74..a6c7b55 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE203.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE203.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE204.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE204.json
index 235ce57..df3b6a2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE204.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE204.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE21.json
index 52760d1..74e4b39 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE21.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE21.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE211.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE211.json
index a2f80de..ef1b047 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE211.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE211.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE212.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE212.json
index 54a6ea6..df04704 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE212.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE212.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE213.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE213.json
index 3075a74..a6c7b55 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE213.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE213.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE214.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE214.json
index 235ce57..df3b6a2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE214.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE214.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE22.json
index 0455d62..5bcdf94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE22.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE22.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE221.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE221.json
index a2f80de..ef1b047 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE221.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE221.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE222.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE222.json
index 54a6ea6..df04704 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE222.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE222.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE223.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE223.json
index 3075a74..a6c7b55 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE223.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE223.json
@@ -1,37 +1,51 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE224.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE224.json
index 235ce57..df3b6a2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE224.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE224.json
@@ -1,70 +1,98 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE23.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE23.json
index fd61928..b600850 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE23.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE23.json
@@ -1,38 +1,50 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE24.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE24.json
index e6ad09d..c258254 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE24.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE24.json
@@ -1,72 +1,96 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ],
-                    "vlan-native": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-native":10,
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE71.json
index 3612a43..714e701 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE71.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE71.json
@@ -1,36 +1,46 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE72.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE72.json
index 77ffa72..39ff60b 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE72.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE72.json
@@ -1,68 +1,88 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE73.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE73.json
index 5479e30..0e53851 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE73.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE73.json
@@ -1,36 +1,46 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE74.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE74.json
index 19e8766..6096427 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE74.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE74.json
@@ -1,68 +1,88 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE81.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE81.json
index 99d5fb4..c5e7ad3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE81.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE81.json
@@ -1,36 +1,46 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE82.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE82.json
index 53c9842..5471812 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE82.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE82.json
@@ -1,68 +1,88 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE83.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE83.json
index 171e702..1511930 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE83.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE83.json
@@ -1,36 +1,46 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE84.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE84.json
index f94869b..c129671 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE84.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE84.json
@@ -1,68 +1,88 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 20 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 10
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":10
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE91.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE91.json
index 73a1abb..117a575 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE91.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE91.json
@@ -1,36 +1,48 @@
 {
-    "ports" : {
-        "of:0000000000000001/1" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE92.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE92.json
index 5f4155c..04161f2 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE92.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE92.json
@@ -1,68 +1,92 @@
 {
-    "ports" : {
-        "of:0000000000000001/2" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/2" : {
-            "interfaces" : [
+        "of:0000000000000002/2":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/3" : {
-            "interfaces" : [
+        "of:0000000000000002/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/4" : {
-            "interfaces" : [
+        "of:0000000000000002/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
+        "of:0000000000000002/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE93.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE93.json
index df66050..aac42a4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE93.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE93.json
@@ -1,36 +1,48 @@
 {
-    "ports" : {
-        "of:0000000000000001/3" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
+        "of:0000000000000001/4":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
+        "of:0000000000000001/5":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE94.json b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE94.json
index b1a50ef..6ce2d0f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE94.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/json/CASE94.json
@@ -1,68 +1,92 @@
 {
-    "ports" : {
-        "of:0000000000000001/6" : {
-            "interfaces" : [
+    "ports":{
+        "of:0000000000000001/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/7" : {
-            "interfaces" : [
+        "of:0000000000000001/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000001/8" : {
-            "interfaces" : [
+        "of:0000000000000001/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000001/9" : {
-            "interfaces" : [
+        "of:0000000000000001/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
+        "of:0000000000000002/6":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
+        "of:0000000000000002/7":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-tagged": [ 10 ]
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-tagged":[
+                        10
+                    ]
                 }
             ]
         },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
+        "of:0000000000000002/8":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
+        "of:0000000000000002/9":{
+            "interfaces":[
                 {
-                    "ips" : [ "10.0.2.254/24" ],
-                    "vlan-untagged": 20
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":20
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
index 3098edf..a25f63e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
@@ -1,611 +1,817 @@
 {
-    "ports" : {
-	"of:0000000000000006/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [127]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 26
-                }
-            ]
-        },       
-	"of:0000000000000006/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [80]
-                }
-            ]
-        },
-        "of:0000000000000006/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 35
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
-                    "vlan-tagged": [ 121 , 30 ]
-                }
-            ]
-        },
-        "of:0000000000000003/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
-                    "vlan-tagged": [ 121, 30 ]
-                }
-            ]
-        },
-        "of:0000000000000004/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
-                    "vlan-tagged": [ 124, 125, 50, 60 ]
-                }
-            ]
-        },
-        "of:0000000000000005/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
-                    "vlan-tagged": [ 124, 125, 50, 60 ]
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 21
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 22
-                }
-            ]
-        },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 11
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 23
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 24
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [121]
-                }
-            ]
-        },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 12
-                }
-            ]
-        },
-        "of:0000000000000002/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000002/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 24
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [121]
-                }
-            ]
-        }, 
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [122]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [123]
-                }
-            ]
-        },
-        "of:0000000000000003/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000003/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000003/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/13" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 25
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [124]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [125]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 25
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [60]
-                }
-            ]
-        },
-        "of:0000000000000004/12" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/13" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/14" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [124]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [125]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [126]
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [60]
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [70]
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/13" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/14" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/15" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 15
+                    "dhcpServerConnectPoint":"of:0000000000000005/15",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/127" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/121" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/122" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/123" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/124" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/125" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/126" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-105,
+                "name":"s001"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":1001,
+                "ipv6Loopback":"2000::c0a8:0001",
+                "ipv6NodeSid":2001,
+                "isEdgeRouter":true,
+                "name":"s001",
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-95,
+                "name":"s002"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":1002,
+                "ipv6Loopback":"2000::c0a8:0002",
+                "ipv6NodeSid":2002,
+                "isEdgeRouter":true,
+                "name":"s002",
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-90,
+                "name":"s003"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":1003,
+                "ipv6Loopback":"2000::c0a8:0003",
+                "ipv6NodeSid":2003,
+                "isEdgeRouter":true,
+                "name":"s003",
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-85,
+                "name":"s004"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":1004,
+                "ipv6Loopback":"2000::c0a8:0004",
+                "ipv6NodeSid":2004,
+                "isEdgeRouter":true,
+                "name":"s004",
+                "pairDeviceId":"of:0000000000000005",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
+            }
+        },
+        "of:0000000000000005":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-80,
+                "name":"s005"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.5",
+                "ipv4NodeSid":1005,
+                "ipv6Loopback":"2000::c0a8:0005",
+                "ipv6NodeSid":2005,
+                "isEdgeRouter":true,
+                "name":"s005",
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
+            }
+        },
+        "of:0000000000000006":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-110,
+                "name":"s006"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.6",
+                "ipv4NodeSid":1006,
+                "ipv6Loopback":"2000::c0a8:0006",
+                "ipv6NodeSid":2006,
+                "isEdgeRouter":true,
+                "name":"s006",
+                "routerMac":"00:00:00:00:00:06"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-100,
+                "name":"s101"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":1101,
+                "ipv6Loopback":"2000::c0a8:0101",
+                "ipv6NodeSid":2101,
+                "isEdgeRouter":false,
+                "name":"s101",
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-95,
+                "name":"s102"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":1102,
+                "ipv6Loopback":"2000::c0a8:0202",
+                "ipv6NodeSid":2102,
+                "isEdgeRouter":false,
+                "name":"s102",
+                "routerMac":"00:00:00:00:01:02"
+            }
+        },
+        "of:0000000000000103":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-115,
+                "name":"s103"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.103",
+                "ipv4NodeSid":1103,
+                "ipv6Loopback":"2000::c0a8:0203",
+                "ipv6NodeSid":2103,
+                "isEdgeRouter":false,
+                "name":"s103",
+                "routerMac":"00:00:00:00:01:03"
+            }
+        },
+        "of:0000000000000104":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-110,
+                "name":"s104"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.104",
+                "ipv4NodeSid":1104,
+                "ipv6Loopback":"2000::c0a8:0204",
+                "ipv6NodeSid":2104,
+                "isEdgeRouter":false,
+                "name":"s104",
+                "routerMac":"00:00:00:00:01:04"
+            }
+        }
     },
-    "devices" : {
-	 "of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
+    "hosts":{
+        "00:BB:00:00:01:0A/127":{
+            "basic":{
+                "ips":[
+                    "1011::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000006/3"
+                ]
             }
         },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
+        "00:bb:00:00:00:04/121":{
+            "basic":{
+                "ips":[
+                    "1004::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000002/8"
+                ]
             }
         },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
+        "00:bb:00:00:00:05/122":{
+            "basic":{
+                "ips":[
+                    "1005::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/8"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
+        "00:bb:00:00:00:07/124":{
+            "basic":{
+                "ips":[
+                    "1008::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000005/6",
+                    "of:0000000000000004/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
+        "00:bb:00:00:00:08/125":{
+            "basic":{
+                "ips":[
+                    "1009::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000004/8",
+                    "of:0000000000000005/7"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
+        "00:bb:00:00:00:0A/126":{
+            "basic":{
+                "ips":[
+                    "1010::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000005/8"
+                ]
             }
         },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
+        "00:bb:00:00:01:05/123":{
+            "basic":{
+                "ips":[
+                    "1006::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/9"
+                ]
             }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
+        }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000005/15",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "1000::3ff/120"
+                    ],
+                    "vlan-untagged":21
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1001::3ff/120"
+                    ],
+                    "vlan-untagged":22
+                }
+            ]
+        },
+        "of:0000000000000001/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.1.0.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.1.10.254/24"
+                    ],
+                    "vlan-untagged":11
+                }
+            ]
+        },
+        "of:0000000000000002/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24"
+                    ],
+                    "vlan-untagged":16
+                }
+            ]
+        },
+        "of:0000000000000002/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120",
+                        "1004::3ff/120",
+                        "10.2.30.254/24",
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        121,
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1002::3ff/120"
+                    ],
+                    "vlan-untagged":23
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120"
+                    ],
+                    "vlan-untagged":24
+                }
+            ]
+        },
+        "of:0000000000000002/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.0.254/24"
+                    ],
+                    "vlan-untagged":12
+                }
+            ]
+        },
+        "of:0000000000000003/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24"
+                    ],
+                    "vlan-untagged":16
+                }
+            ]
+        },
+        "of:0000000000000003/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/13":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.40.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120",
+                        "1004::3ff/120",
+                        "10.2.30.254/24",
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        121,
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120"
+                    ],
+                    "vlan-untagged":24
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1005::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        122
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1006::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        123
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "10.0.7.254/24",
+                        "2000::1ff/120",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-tagged":[
+                        110,
+                        170
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/13":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":110
+                }
+            ]
+        },
+        "of:0000000000000004/14":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.7.254/24",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-untagged":170
+                }
+            ]
+        },
+        "of:0000000000000004/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120",
+                        "1009::3ff/120",
+                        "10.3.10.254/24",
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        124,
+                        125,
+                        50,
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1007::3ff/120"
+                    ],
+                    "vlan-untagged":25
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.0.254/24"
+                    ],
+                    "vlan-untagged":25
+                }
+            ]
+        },
+        "of:0000000000000005/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        70
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "10.0.6.254/24",
+                        "2000::5ff/120",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-tagged":[
+                        150,
+                        160
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/13":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "2000::5ff/120"
+                    ],
+                    "vlan-untagged":150
+                }
+            ]
+        },
+        "of:0000000000000005/14":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.6.254/24",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-untagged":160
+                }
+            ]
+        },
+        "of:0000000000000005/15":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":15
+                }
+            ]
+        },
+        "of:0000000000000005/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120",
+                        "1009::3ff/120",
+                        "10.3.10.254/24",
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        124,
+                        125,
+                        50,
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1010::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        126
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1011::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        127
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1012::3ff/120"
+                    ],
+                    "vlan-untagged":26
+                }
+            ]
+        },
+        "of:0000000000000006/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.5.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        80
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.5.20.254/24"
+                    ],
+                    "vlan-untagged":35
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/flex.json b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/flex.json
index c8f1ff2..56e4860 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/flex.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/flex.json
@@ -1,460 +1,652 @@
 {
-    "ports" : {
-        "of:0000000000000205/1" : {
-    	    "interfaces" : [{
-    		    "ips" : [ "10.0.205.254/24" ],
-    		    "vlan-untagged": 205
-    	    }]
-    	},
-        "of:0000000000000205/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.205.254/24" ],
-                "vlan-untagged": 205
-            }]
-        },
-        "of:0000000000000206/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.206.254/24" ],
-                "vlan-untagged": 206
-            }]
-        },
-        "of:0000000000000206/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.206.254/24" ],
-                "vlan-untagged": 206
-            }]
-        },
-        "of:0000000000000203/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-tagged": [204]
-            }]
-        },
-        "of:0000000000000204/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-tagged": [204]
-            }]
-        },
-        "of:0000000000000201/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/17" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.101.254/24" ],
-                "vlan-untagged": 101
-            }]
-        },
-        "of:0000000000000201/18" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.101.254/24" ],
-                "vlan-untagged": 101
-            }]
-        },
-        "of:0000000000000201/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-tagged": [202]
-            }]
-        },
-        "of:0000000000000202/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/17" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.102.254/24" ],
-                "vlan-untagged": 102
-            }]
-        },
-        "of:0000000000000202/18" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.102.254/24" ],
-                "vlan-untagged": 102
-            }]
-        },
-        "of:0000000000000202/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-tagged": [202]
-            }]
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
+                {
+                    "dhcpServerConnectPoint":"of:0000000000000204/8",
+                    "serverIps":[
+                        "10.0.204.8"
+                    ]
+                }
+            ]
         }
     },
-    "devices" : {
-        "of:0000000000000201" : {
-	        "basic" : {
-	    	    "name": "201-qmx",
-	    	    "latitude" : 34,
-	    	    "longitude": -95
-	        },
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.201",
-                "ipv6NodeSid" : 201,
-                "ipv6Loopback" : "2000::c0a8:0201",
-                "routerMac" : "00:00:02:01:02:02",
-	    	    "pairDeviceId" : "of:0000000000000202",
-	    	    "pairLocalPort" : 20,
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-                }
+    "devices":{
+        "of:0000000000000201":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-95,
+                "name":"201-qmx"
             },
-	    "of:0000000000000202" : {
-	        "basic" : {
-	    	    "name": "202-qmx",
-	    	    "latitude" : 34,
-	    	    "longitude": -90
-	        },
-	        "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.202",
-                "ipv6NodeSid" : 202,
-                "ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:02:01:02:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000201",
-                "pairLocalPort" : 20,
-	    	    "adjacencySids" : []
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.201",
+                "ipv4NodeSid":201,
+                "ipv6Loopback":"2000::c0a8:0201",
+                "ipv6NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000202",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:01:02:02"
             }
         },
-        "of:0000000000000203" : {
-	        "basic" : {
-	            "name": "203-qmx",
-	            "latitude" : 34,
-	            "longitude": -108
-	        },
-            "segmentrouting" : {
-                "name" : "Leaf2-R1",
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.203",
-                "ipv6NodeSid" : 203,
-                "ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:02:03:02:04",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000204",
-                "pairLocalPort" : 20,
-                "adjacencySids" : []
+        "of:0000000000000202":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-90,
+                "name":"202-qmx"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.202",
+                "ipv4NodeSid":202,
+                "ipv6Loopback":"2000::c0a8:0202",
+                "ipv6NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000201",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:01:02:02"
             }
         },
-        "of:0000000000000204" : {
-	        "basic" : {
-	            "name": "204-qmx",
-	            "latitude" : 34,
-	            "longitude": -103
-	        },
-            "segmentrouting" : {
-                "name" : "Leaf1-R1",
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.204",
-                "ipv6NodeSid" : 204,
-                "ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:02:03:02:04",
-                "pairDeviceId" : "of:0000000000000203",
-                "pairLocalPort" : 20,
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000203":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-108,
+                "name":"203-qmx"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.203",
+                "ipv4NodeSid":203,
+                "ipv6Loopback":"2000::c0a8:0203",
+                "ipv6NodeSid":203,
+                "isEdgeRouter":true,
+                "name":"Leaf2-R1",
+                "pairDeviceId":"of:0000000000000204",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:03:02:04"
             }
         },
-   	    "of:0000000000000225" : {
-	        "basic" : {
-	    	    "name": "225-t2",
-	    	    "latitude" : 42,
-	    	    "longitude": -100
-	        },
-        	"segmentrouting" : {
-                "name" : "SpineToma-0",
-                "ipv4NodeSid" : 225,
-                "ipv4Loopback" : "192.168.0.225",
-	    	    "ipv6NodeSid" : 225,
-                "ipv6Loopback" : "2000::c0a8:0225",
-                "routerMac" : "00:00:02:25:00:01",
-                "isEdgeRouter" : false,
-	    	    "adjacencySids" : []
-            }
-        },
-        "of:0000000000000226" : {
-	        "basic" : {
-	    	    "name": "226-tmhk",
-	    	    "latitude" : 42,
-	    	    "longitude": -95
-	        },
-            "segmentrouting" : {
-                "name" : "Spine1",
-                "ipv4NodeSid" : 226,
-                "ipv4Loopback" : "192.168.0.226",
-                "ipv6NodeSid" : 226,
-                "ipv6Loopback" : "2000::c0a8:0226",
-                "routerMac" : "00:00:02:26:00:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000204":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-103,
+                "name":"204-qmx"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.204",
+                "ipv4NodeSid":204,
+                "ipv6Loopback":"2000::c0a8:0204",
+                "ipv6NodeSid":204,
+                "isEdgeRouter":true,
+                "name":"Leaf1-R1",
+                "pairDeviceId":"of:0000000000000203",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:03:02:04"
             }
         },
         "of:0000000000000205":{
             "basic":{
-                "name":"205-qmx",
+                "driver":"ofdpa-ovs",
                 "latitude":34,
-                "longitude":-120
+                "longitude":-120,
+                "name":"205-qmx"
             },
             "segmentrouting":{
-                "name":"Leaf1",
-                "ipv4NodeSid":205,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.205",
-                "ipv6NodeSid":205,
+                "ipv4NodeSid":205,
                 "ipv6Loopback":"2000::c0a8:0205",
-                "routerMac":"00:00:02:05:06:01",
+                "ipv6NodeSid":205,
                 "isEdgeRouter":true,
-                "adjacencySids":[
-                ]
+                "name":"Leaf1",
+                "routerMac":"00:00:02:05:06:01"
             }
         },
         "of:0000000000000206":{
             "basic":{
-                "name":"206-qmx",
+                "driver":"ofdpa-ovs",
                 "latitude":34,
-                "longitude":-115
+                "longitude":-115,
+                "name":"206-qmx"
             },
             "segmentrouting":{
-                "name":"Leaf2",
-                "ipv4NodeSid":206,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.206",
-                "ipv6NodeSid":206,
+                "ipv4NodeSid":206,
                 "ipv6Loopback":"2000::c0a8:0206",
-                "routerMac":"00:00:02:06:06:01",
+                "ipv6NodeSid":206,
                 "isEdgeRouter":true,
-                "adjacencySids":[
-                ]
+                "name":"Leaf2",
+                "routerMac":"00:00:02:06:06:01"
+            }
+        },
+        "of:0000000000000225":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-100,
+                "name":"225-t2"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.225",
+                "ipv4NodeSid":225,
+                "ipv6Loopback":"2000::c0a8:0225",
+                "ipv6NodeSid":225,
+                "isEdgeRouter":false,
+                "name":"SpineToma-0",
+                "routerMac":"00:00:02:25:00:01"
+            }
+        },
+        "of:0000000000000226":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-95,
+                "name":"226-tmhk"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.226",
+                "ipv4NodeSid":226,
+                "ipv6Loopback":"2000::c0a8:0226",
+                "ipv6NodeSid":226,
+                "isEdgeRouter":false,
+                "name":"Spine1",
+                "routerMac":"00:00:02:26:00:01"
             }
         },
         "of:0000000000000227":{
             "basic":{
-                "name":"227-tmhk",
+                "driver":"ofdpa-ovs",
                 "latitude":38,
-                "longitude":-119
+                "longitude":-119,
+                "name":"227-tmhk"
             },
             "segmentrouting":{
-                "name":"Spine1",
-                "ipv4NodeSid":227,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.227",
-                "ipv6NodeSid":227,
+                "ipv4NodeSid":227,
                 "ipv6Loopback":"2000::c0a8:0227",
-                "routerMac":"00:00:02:27:00:01",
+                "ipv6NodeSid":227,
                 "isEdgeRouter":false,
-                "adjacencySids":[
-                ]
+                "name":"Spine1",
+                "routerMac":"00:00:02:27:00:01"
             }
         },
         "of:0000000000000228":{
             "basic":{
-                "name":"228-t2",
+                "driver":"ofdpa-ovs",
                 "latitude":38,
-                "longitude":-116
+                "longitude":-116,
+                "name":"228-t2"
             },
             "segmentrouting":{
-                "name":"Spine2",
-                "ipv4NodeSid":228,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.228",
-                "ipv6NodeSid":228,
+                "ipv4NodeSid":228,
                 "ipv6Loopback":"2000::c0a8:0228",
-                "routerMac":"00:00:02:28:00:01",
+                "ipv6NodeSid":228,
                 "isEdgeRouter":false,
-                "adjacencySids":[
-                ]
+                "name":"Spine2",
+                "routerMac":"00:00:02:28:00:01"
             }
         }
     },
-    "apps" : {
-            "org.onosproject.dhcprelay" : {
-    	    "default" : [
-    		    {
-                    "dhcpServerConnectPoint": "of:0000000000000204/8",
-                    "serverIps": ["10.0.204.8"]
-    		    }
-    	    ]
+    "ports":{
+        "of:0000000000000201/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/17":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.101.254/24"
+                    ],
+                    "vlan-untagged":101
+                }
+            ]
+        },
+        "of:0000000000000201/18":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.101.254/24"
+                    ],
+                    "vlan-untagged":101
+                }
+            ]
+        },
+        "of:0000000000000201/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-tagged":[
+                        202
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000201/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/17":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.102.254/24"
+                    ],
+                    "vlan-untagged":102
+                }
+            ]
+        },
+        "of:0000000000000202/18":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.102.254/24"
+                    ],
+                    "vlan-untagged":102
+                }
+            ]
+        },
+        "of:0000000000000202/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-tagged":[
+                        202
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000202/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000203/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-tagged":[
+                        204
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000203/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-tagged":[
+                        204
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000204/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000205/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.205.254/24"
+                    ],
+                    "vlan-untagged":205
+                }
+            ]
+        },
+        "of:0000000000000205/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.205.254/24"
+                    ],
+                    "vlan-untagged":205
+                }
+            ]
+        },
+        "of:0000000000000206/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.206.254/24"
+                    ],
+                    "vlan-untagged":206
+                }
+            ]
+        },
+        "of:0000000000000206/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.206.254/24"
+                    ],
+                    "vlan-untagged":206
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json
index 1774bf6..7441ed8 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=0_ipv6=1.json
@@ -1,473 +1,611 @@
 {
-    "ports" : {
-         "of:0000000000000006/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [127]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 26
-                }
-            ]
-        },  
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 21
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" , "1004::3ff/120"],
-                    "vlan-tagged": [ 121 ]
-                }
-            ]
-        },
-        "of:0000000000000003/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" , "1004::3ff/120"],
-                    "vlan-tagged": [ 121 ]
-                }
-            ]
-        },
-        "of:0000000000000004/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120", "1009::3ff/120" ],
-                    "vlan-tagged": [ 124, 125 ]
-                }
-            ]
-        },
-        "of:0000000000000005/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120", "1009::3ff/120" ],
-                    "vlan-tagged": [ 124, 125 ]
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 22
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 23
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 24
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [121]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [122]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [123]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 24
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [121]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 25
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [124]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [125]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [126]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [124]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [125]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "2000::3ff/120" ],
-                    "vlan-untagged": 15
+                    "dhcpServerConnectPoint":"of:0000000000000005/12",
+                    "serverIps":[
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/127" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/121" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/122" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/123" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/124" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/125" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/126" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-105,
+                "name":"s001"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":1001,
+                "ipv6Loopback":"2000::c0a8:0001",
+                "ipv6NodeSid":2001,
+                "isEdgeRouter":true,
+                "name":"s001",
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-95,
+                "name":"s002"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":1002,
+                "ipv6Loopback":"2000::c0a8:0002",
+                "ipv6NodeSid":2002,
+                "isEdgeRouter":true,
+                "name":"s002",
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-90,
+                "name":"s003"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":1003,
+                "ipv6Loopback":"2000::c0a8:0003",
+                "ipv6NodeSid":2003,
+                "isEdgeRouter":true,
+                "name":"s003",
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-85,
+                "name":"s004"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":1004,
+                "ipv6Loopback":"2000::c0a8:0004",
+                "ipv6NodeSid":2004,
+                "isEdgeRouter":true,
+                "name":"s004",
+                "pairDeviceId":"of:0000000000000005",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
+            }
+        },
+        "of:0000000000000005":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-80,
+                "name":"s005"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.5",
+                "ipv4NodeSid":1005,
+                "ipv6Loopback":"2000::c0a8:0005",
+                "ipv6NodeSid":2005,
+                "isEdgeRouter":true,
+                "name":"s005",
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
+            }
+        },
+        "of:0000000000000006":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-110,
+                "name":"s006"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.6",
+                "ipv4NodeSid":1006,
+                "ipv6Loopback":"2000::c0a8:0006",
+                "ipv6NodeSid":2006,
+                "isEdgeRouter":true,
+                "name":"s006",
+                "routerMac":"00:00:00:00:00:06"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-100,
+                "name":"s101"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":1101,
+                "ipv6Loopback":"2000::c0a8:0101",
+                "ipv6NodeSid":2101,
+                "isEdgeRouter":false,
+                "name":"s101",
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-95,
+                "name":"s102"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":1102,
+                "ipv6Loopback":"2000::c0a8:0202",
+                "ipv6NodeSid":2102,
+                "isEdgeRouter":false,
+                "name":"s102",
+                "routerMac":"00:00:00:00:01:02"
+            }
+        },
+        "of:0000000000000103":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-115,
+                "name":"s103"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.103",
+                "ipv4NodeSid":1103,
+                "ipv6Loopback":"2000::c0a8:0203",
+                "ipv6NodeSid":2103,
+                "isEdgeRouter":false,
+                "name":"s103",
+                "routerMac":"00:00:00:00:01:03"
+            }
+        },
+        "of:0000000000000104":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-110,
+                "name":"s104"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.104",
+                "ipv4NodeSid":1104,
+                "ipv6Loopback":"2000::c0a8:0204",
+                "ipv6NodeSid":2104,
+                "isEdgeRouter":false,
+                "name":"s104",
+                "routerMac":"00:00:00:00:01:04"
+            }
+        }
     },
-    "devices" : {
-	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
+    "hosts":{
+        "00:BB:00:00:01:0A/127":{
+            "basic":{
+                "ips":[
+                    "1011::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000006/3"
+                ]
             }
         },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
+        "00:bb:00:00:00:04/121":{
+            "basic":{
+                "ips":[
+                    "1004::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000002/8"
+                ]
             }
         },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
+        "00:bb:00:00:00:05/122":{
+            "basic":{
+                "ips":[
+                    "1005::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/8"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
+        "00:bb:00:00:00:07/124":{
+            "basic":{
+                "ips":[
+                    "1008::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000005/6",
+                    "of:0000000000000004/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
+        "00:bb:00:00:00:08/125":{
+            "basic":{
+                "ips":[
+                    "1009::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000004/8",
+                    "of:0000000000000005/7"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
+        "00:bb:00:00:00:0A/126":{
+            "basic":{
+                "ips":[
+                    "1010::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000005/8"
+                ]
             }
         },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
+        "00:bb:00:00:01:05/123":{
+            "basic":{
+                "ips":[
+                    "1006::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/9"
+                ]
             }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
+        }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["2000::3fd"]
+                    "ips":[
+                        "1000::3ff/120"
+                    ],
+                    "vlan-untagged":21
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1001::3ff/120"
+                    ],
+                    "vlan-untagged":22
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120",
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1002::3ff/120"
+                    ],
+                    "vlan-untagged":23
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120"
+                    ],
+                    "vlan-untagged":24
+                }
+            ]
+        },
+        "of:0000000000000002/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120",
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120"
+                    ],
+                    "vlan-untagged":24
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1005::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        122
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1006::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        123
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":110
+                }
+            ]
+        },
+        "of:0000000000000004/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.7.254/24",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-untagged":170
+                }
+            ]
+        },
+        "of:0000000000000004/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120",
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124,
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1007::3ff/120"
+                    ],
+                    "vlan-untagged":25
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "10.0.7.254/24",
+                        "2000::1ff/120",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-tagged":[
+                        110,
+                        170
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "2000::5ff/120"
+                    ],
+                    "vlan-untagged":150
+                }
+            ]
+        },
+        "of:0000000000000005/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.6.254/24",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-untagged":160
+                }
+            ]
+        },
+        "of:0000000000000005/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":15
+                }
+            ]
+        },
+        "of:0000000000000005/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120",
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124,
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1010::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        126
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "10.0.6.254/24",
+                        "2000::5ff/120",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-tagged":[
+                        150,
+                        160
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1011::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        127
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1012::3ff/120"
+                    ],
+                    "vlan-untagged":26
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json
index f7d41ed..0ff7a0e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=0.json
@@ -1,417 +1,522 @@
 {
-    "ports" : {
-	"of:0000000000000006/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [80]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 35
-                }
-            ]
-        },    
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 11
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 12
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24", "10.2.20.254/24"],
-                    "vlan-tagged": [ 30 ]
-                }
-            ]
-        },
-        "of:0000000000000003/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24", "10.2.20.254/24"],
-                    "vlan-tagged": [ 30 ]
-                }
-            ]
-        },
-        "of:0000000000000004/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24", "10.3.30.254/24"],
-                    "vlan-tagged": [ 50, 60 ]
-                }
-            ]
-        },
-        "of:0000000000000005/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24", "10.3.30.254/24"],
-                    "vlan-tagged": [ 50, 60 ]
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 25
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [60]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [70]
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [60]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24" ],
-                    "vlan-untagged": 15
+                    "dhcpServerConnectPoint":"of:0000000000000005/12",
+                    "serverIps":[
+                        "10.0.3.253"
+                    ]
                 }
             ]
         }
     },
-    "devices" : {
-	"of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-105,
+                "name":"s001"
             },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":1001,
+                "isEdgeRouter":true,
+                "name":"s001",
+                "routerMac":"00:00:00:00:00:01"
             }
         },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-95,
+                "name":"s002"
             },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":1002,
+                "isEdgeRouter":true,
+                "name":"s002",
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-90,
+                "name":"s003"
             },
-            "basic" : {
-                 "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},   
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":1003,
+                "isEdgeRouter":true,
+                "name":"s003",
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-85,
+                "name":"s004"
             },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":1004,
+                "isEdgeRouter":true,
+                "name":"s004",
+                "pairDeviceId":"of:0000000000000005",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
+        "of:0000000000000005":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-80,
+                "name":"s005"
             },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.5",
+                "ipv4NodeSid":1005,
+                "isEdgeRouter":true,
+                "name":"s005",
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
+        "of:0000000000000006":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-110,
+                "name":"s006"
             },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.6",
+                "ipv4NodeSid":1006,
+                "ipv6Loopback":"2000::c0a8:0006",
+                "ipv6NodeSid":2006,
+                "isEdgeRouter":true,
+                "name":"s006",
+                "routerMac":"00:00:00:00:00:06"
             }
         },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-100,
+                "name":"s101"
             },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":1101,
+                "isEdgeRouter":false,
+                "name":"s101",
+                "routerMac":"00:00:00:00:01:01"
             }
         },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-95,
+                "name":"s102"
             },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":1102,
+                "isEdgeRouter":false,
+                "name":"s102",
+                "routerMac":"00:00:00:00:01:02"
             }
         },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000103":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-115,
+                "name":"s103"
             },
-            "basic" : {
-                 "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.103",
+                "ipv4NodeSid":1103,
+                "ipv6Loopback":"2000::c0a8:0203",
+                "ipv6NodeSid":2103,
+                "isEdgeRouter":false,
+                "name":"s103",
+                "routerMac":"00:00:00:00:01:03"
             }
-        }   
+        },
+        "of:0000000000000104":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-110,
+                "name":"s104"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.104",
+                "ipv4NodeSid":1104,
+                "ipv6Loopback":"2000::c0a8:0204",
+                "ipv6NodeSid":2104,
+                "isEdgeRouter":false,
+                "name":"s104",
+                "routerMac":"00:00:00:00:01:04"
+            }
+        }
     },
-    "apps" : {
-       "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000005/12",
-                    "serverIps": ["10.0.3.253"]
+                    "ips":[
+                        "10.1.0.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.1.10.254/24"
+                    ],
+                    "vlan-untagged":11
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24",
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.0.254/24"
+                    ],
+                    "vlan-untagged":12
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24"
+                    ],
+                    "vlan-untagged":16
+                }
+            ]
+        },
+        "of:0000000000000002/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24",
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24"
+                    ],
+                    "vlan-untagged":16
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.40.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":110
+                }
+            ]
+        },
+        "of:0000000000000004/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.7.254/24",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-untagged":170
+                }
+            ]
+        },
+        "of:0000000000000004/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24",
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50,
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.0.254/24"
+                    ],
+                    "vlan-untagged":25
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "10.0.7.254/24",
+                        "2000::1ff/120",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-tagged":[
+                        110,
+                        170
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "2000::5ff/120"
+                    ],
+                    "vlan-untagged":150
+                }
+            ]
+        },
+        "of:0000000000000005/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.6.254/24",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-untagged":160
+                }
+            ]
+        },
+        "of:0000000000000005/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":15
+                }
+            ]
+        },
+        "of:0000000000000005/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24",
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50,
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        70
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "10.0.6.254/24",
+                        "2000::5ff/120",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-tagged":[
+                        150,
+                        160
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.5.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        80
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.5.20.254/24"
+                    ],
+                    "vlan-untagged":35
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
index 3098edf..a25f63e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
@@ -1,611 +1,817 @@
 {
-    "ports" : {
-	"of:0000000000000006/3" : {
-            "interfaces" : [
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
                 {
-                    "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [127]
-                }
-            ]
-        },
-        "of:0000000000000006/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 26
-                }
-            ]
-        },       
-	"of:0000000000000006/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [80]
-                }
-            ]
-        },
-        "of:0000000000000006/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 35
-                }
-            ]
-        },
-        "of:0000000000000002/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
-                    "vlan-tagged": [ 121 , 30 ]
-                }
-            ]
-        },
-        "of:0000000000000003/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" , "1004::3ff/120", "10.2.30.254/24", "10.2.20.254/24"],
-                    "vlan-tagged": [ 121, 30 ]
-                }
-            ]
-        },
-        "of:0000000000000004/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
-                    "vlan-tagged": [ 124, 125, 50, 60 ]
-                }
-            ]
-        },
-        "of:0000000000000005/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120", "1009::3ff/120", "10.3.10.254/24", "10.3.30.254/24" ],
-                    "vlan-tagged": [ 124, 125, 50, 60 ]
-                }
-            ]
-        },
-        "of:0000000000000001/3" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1000::3ff/120" ],
-                    "vlan-untagged": 21
-                }
-            ]
-        },
-        "of:0000000000000001/4" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 22
-                }
-            ]
-        },
-        "of:0000000000000001/5" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.0.254/24" ],
-                    "vlan-untagged": 10
-                }
-            ]
-        },
-        "of:0000000000000001/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 11
-                }
-            ]
-        },
-        "of:0000000000000002/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 23
-                }
-            ]
-        },
-        "of:0000000000000002/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 24
-                }
-            ]
-        },
-        "of:0000000000000002/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [121]
-                }
-            ]
-        },
-        "of:0000000000000002/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 12
-                }
-            ]
-        },
-        "of:0000000000000002/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000002/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        },
-        "of:0000000000000003/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 24
-                }
-            ]
-        },
-        "of:0000000000000003/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [121]
-                }
-            ]
-        }, 
-        "of:0000000000000003/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [122]
-                }
-            ]
-        },
-	"of:0000000000000003/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [123]
-                }
-            ]
-        },
-        "of:0000000000000003/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 16
-                }
-            ]
-        },
-        "of:0000000000000003/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.20.254/24" ],
-                    "vlan-tagged": [30]
-                }
-            ]
-        }, 
-        "of:0000000000000003/12" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.10.254/24" ],
-                    "vlan-tagged": [20]
-                }
-            ]
-        },
-	"of:0000000000000003/13" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.2.40.254/24" ],
-                    "vlan-tagged": [40]
-                }
-            ]
-        },
-        "of:0000000000000004/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 25
-                }
-            ]
-        },
-        "of:0000000000000004/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [124]
-                }
-            ]
-        },
-        "of:0000000000000004/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [125]
-                }
-            ]
-        },
-        "of:0000000000000004/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 25
-                }
-            ]
-        },
-        "of:0000000000000004/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000004/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [60]
-                }
-            ]
-        },
-        "of:0000000000000004/12" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "10.0.7.254/24", "2000::1ff/120", "2000::7ff/120" ],
-			"vlan-tagged": [110, 170]
-
-                }
-            ]
-        },
-        "of:0000000000000004/13" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.1.254/24", "2000::1ff/120"],
-			"vlan-untagged": 110
-
-                }
-            ]
-        },
-        "of:0000000000000004/14" : {
-            "interfaces" : [
-                {
-			"ips" : [ "10.0.7.254/24", "2000::7ff/120" ],
-			"vlan-untagged": 170
-
-                }
-            ]
-        },
-        "of:0000000000000005/6" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [124]
-                }
-            ]
-        },
-        "of:0000000000000005/7" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [125]
-                }
-            ]
-        },
-        "of:0000000000000005/8" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [126]
-                }
-            ]
-        },
-        "of:0000000000000005/9" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [50]
-                }
-            ]
-        },
-        "of:0000000000000005/10" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [60]
-                }
-            ]
-        },
-        "of:0000000000000005/11" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [70]
-                }
-            ]
-        },
-        "of:0000000000000005/12" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "10.0.6.254/24", "2000::5ff/120", "2000::6ff/120" ],
-	               "vlan-tagged": [150, 160]
-                }
-            ]
-        },
-        "of:0000000000000005/13" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.5.254/24", "2000::5ff/120"],
-	               "vlan-untagged": 150
-                }
-            ]
-        },
-        "of:0000000000000005/14" : {
-            "interfaces" : [
-                {
-                       "ips" : [ "10.0.6.254/24", "2000::6ff/120" ],
-	               "vlan-untagged": 160
-                }
-            ]
-        },
-        "of:0000000000000005/15" : {
-            "interfaces" : [
-                {
-                    "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
-                    "vlan-untagged": 15
+                    "dhcpServerConnectPoint":"of:0000000000000005/15",
+                    "serverIps":[
+                        "10.0.3.253",
+                        "2000::3fd"
+                    ]
                 }
             ]
         }
     },
-    "hosts" : { 
-	"00:BB:00:00:01:0A/127" : {
-		"basic": {
-			"locations": ["of:0000000000000006/3"],
-			"ips": ["1011::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:04/121" : {
-		"basic": {
-			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
-			"ips": ["1004::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:05/122" : {
-		"basic": {
-			"locations": ["of:0000000000000003/8"],
-			"ips": ["1005::3fe"]
-		     }
-	    },
-	"00:bb:00:00:01:05/123" : {
-		"basic": {
-			"locations": ["of:0000000000000003/9"],
-			"ips": ["1006::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:07/124" : {
-		"basic": {
-			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
-			"ips": ["1008::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:08/125" : {
-		"basic": {
-			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
-			"ips": ["1009::3fe"]
-		     }
-	    },
-	"00:bb:00:00:00:0A/126" : {
-		"basic": {
-			"locations": ["of:0000000000000005/8"],
-			"ips": ["1010::3fe"]
-		     }
-	    }
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-105,
+                "name":"s001"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":1001,
+                "ipv6Loopback":"2000::c0a8:0001",
+                "ipv6NodeSid":2001,
+                "isEdgeRouter":true,
+                "name":"s001",
+                "routerMac":"00:00:00:00:00:01"
+            }
+        },
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-95,
+                "name":"s002"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":1002,
+                "ipv6Loopback":"2000::c0a8:0002",
+                "ipv6NodeSid":2002,
+                "isEdgeRouter":true,
+                "name":"s002",
+                "pairDeviceId":"of:0000000000000003",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-90,
+                "name":"s003"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":1003,
+                "ipv6Loopback":"2000::c0a8:0003",
+                "ipv6NodeSid":2003,
+                "isEdgeRouter":true,
+                "name":"s003",
+                "pairDeviceId":"of:0000000000000002",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:02"
+            }
+        },
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-85,
+                "name":"s004"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":1004,
+                "ipv6Loopback":"2000::c0a8:0004",
+                "ipv6NodeSid":2004,
+                "isEdgeRouter":true,
+                "name":"s004",
+                "pairDeviceId":"of:0000000000000005",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
+            }
+        },
+        "of:0000000000000005":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-80,
+                "name":"s005"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.5",
+                "ipv4NodeSid":1005,
+                "ipv6Loopback":"2000::c0a8:0005",
+                "ipv6NodeSid":2005,
+                "isEdgeRouter":true,
+                "name":"s005",
+                "pairDeviceId":"of:0000000000000004",
+                "pairLocalPort":5,
+                "routerMac":"00:00:00:00:00:04"
+            }
+        },
+        "of:0000000000000006":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":30,
+                "longitude":-110,
+                "name":"s006"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.6",
+                "ipv4NodeSid":1006,
+                "ipv6Loopback":"2000::c0a8:0006",
+                "ipv6NodeSid":2006,
+                "isEdgeRouter":true,
+                "name":"s006",
+                "routerMac":"00:00:00:00:00:06"
+            }
+        },
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-100,
+                "name":"s101"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":1101,
+                "ipv6Loopback":"2000::c0a8:0101",
+                "ipv6NodeSid":2101,
+                "isEdgeRouter":false,
+                "name":"s101",
+                "routerMac":"00:00:00:00:01:01"
+            }
+        },
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-95,
+                "name":"s102"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":1102,
+                "ipv6Loopback":"2000::c0a8:0202",
+                "ipv6NodeSid":2102,
+                "isEdgeRouter":false,
+                "name":"s102",
+                "routerMac":"00:00:00:00:01:02"
+            }
+        },
+        "of:0000000000000103":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-115,
+                "name":"s103"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.103",
+                "ipv4NodeSid":1103,
+                "ipv6Loopback":"2000::c0a8:0203",
+                "ipv6NodeSid":2103,
+                "isEdgeRouter":false,
+                "name":"s103",
+                "routerMac":"00:00:00:00:01:03"
+            }
+        },
+        "of:0000000000000104":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":35,
+                "longitude":-110,
+                "name":"s104"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.104",
+                "ipv4NodeSid":1104,
+                "ipv6Loopback":"2000::c0a8:0204",
+                "ipv6NodeSid":2104,
+                "isEdgeRouter":false,
+                "name":"s104",
+                "routerMac":"00:00:00:00:01:04"
+            }
+        }
     },
-    "devices" : {
-	 "of:0000000000000006" : {
-            "segmentrouting" : {
-                "name" : "s006",
-                "ipv4NodeSid" : 1006,
-		"ipv6NodeSid" : 2006,
-		"ipv6Loopback" : "2000::c0a8:0006",
-                "ipv4Loopback" : "192.168.0.6",
-                "routerMac" : "00:00:00:00:00:06",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s006",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-110
+    "hosts":{
+        "00:BB:00:00:01:0A/127":{
+            "basic":{
+                "ips":[
+                    "1011::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000006/3"
+                ]
             }
         },
-        "of:0000000000000103" : {
-            "segmentrouting" : {
-                "name" : "s103",
-                "ipv4NodeSid" : 1103,
-                "ipv4Loopback" : "192.168.0.103",
-		"ipv6NodeSid" : 2103,
-		"ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s103",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-115
+        "00:bb:00:00:00:04/121":{
+            "basic":{
+                "ips":[
+                    "1004::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/7",
+                    "of:0000000000000002/8"
+                ]
             }
         },
-        "of:0000000000000104" : {
-            "segmentrouting" : {
-                "name" : "s104",
-                "ipv4NodeSid" : 1104,
-                "ipv4Loopback" : "192.168.0.104",
-		"ipv6NodeSid" : 2104,
-		"ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                 "name" : "s104",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":35,
-		 "longitude":-110
-            }
-	},
-        "of:0000000000000001" : {
-            "segmentrouting" : {
-                "name" : "s001",
-                "ipv4NodeSid" : 1001,
-		"ipv6NodeSid" : 2001,
-		"ipv6Loopback" : "2000::c0a8:0001",
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "00:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s001",
-                "driver" : "ofdpa-ovs",
-		"latitude":30,	
-		"longitude":-105
+        "00:bb:00:00:00:05/122":{
+            "basic":{
+                "ips":[
+                    "1005::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/8"
+                ]
             }
         },
-        "of:0000000000000002" : {
-            "segmentrouting" : {
-                "name" : "s002",
-                "ipv4NodeSid" : 1002,
-                "ipv4Loopback" : "192.168.0.2",
-		"ipv6NodeSid" : 2002,
-		"ipv6Loopback" : "2000::c0a8:0002",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000003",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s002",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-95
+        "00:bb:00:00:00:07/124":{
+            "basic":{
+                "ips":[
+                    "1008::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000005/6",
+                    "of:0000000000000004/7"
+                ]
             }
         },
-        "of:0000000000000003" : {
-            "segmentrouting" : {
-                "name" : "s003",
-                "ipv4NodeSid" : 1003,
-                "ipv4Loopback" : "192.168.0.3",
-        	"ipv6NodeSid" : 2003,
-		"ipv6Loopback" : "2000::c0a8:0003",
-                "routerMac" : "00:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000002",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s003",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-90
+        "00:bb:00:00:00:08/125":{
+            "basic":{
+                "ips":[
+                    "1009::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000004/8",
+                    "of:0000000000000005/7"
+                ]
             }
         },
-        "of:0000000000000004" : {
-            "segmentrouting" : {
-                "name" : "s004",
-                "ipv4NodeSid" : 1004,
-                "ipv4Loopback" : "192.168.0.4",
-		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",        
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000005",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s004",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-85
+        "00:bb:00:00:00:0A/126":{
+            "basic":{
+                "ips":[
+                    "1010::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000005/8"
+                ]
             }
         },
-        "of:0000000000000005" : {
-            "segmentrouting" : {
-                "name" : "s005",
-                "ipv4NodeSid" : 1005,
-                "ipv4Loopback" : "192.168.0.5",
-		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005", 
-                "routerMac" : "00:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "pairLocalPort" : 5,
-                "pairDeviceId": "of:0000000000000004",
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s005",
-                "driver" : "ofdpa-ovs",
-		"latitude":34,	
-		"longitude":-80
+        "00:bb:00:00:01:05/123":{
+            "basic":{
+                "ips":[
+                    "1006::3fe"
+                ],
+                "locations":[
+                    "of:0000000000000003/9"
+                ]
             }
-        },
-        "of:0000000000000101" : {
-            "segmentrouting" : {
-                "name" : "s101",
-                "ipv4NodeSid" : 1101,
-                "ipv4Loopback" : "192.168.0.101",
-		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101", 
-                "routerMac" : "00:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s101",
-                "driver" : "ofdpa-ovs",
-		"latitude":42,
-                "longitude":-100
-            }
-        },
-        "of:0000000000000102" : {
-            "segmentrouting" : {
-                "name" : "s102",
-                "ipv4NodeSid" : 1102,
-                "ipv4Loopback" : "192.168.0.102",
-		"ipv6NodeSid" : 2102,
-		"ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
-            },
-            "basic" : {
-                "name" : "s102",
-                 "driver" : "ofdpa-ovs",
-		 "latitude":42,
-		 "longitude":-95
-            }
-        }   
+        }
     },
-    "apps" : {
-        "org.onosproject.dhcprelay" : {
-            "default": [
+    "ports":{
+        "of:0000000000000001/3":{
+            "interfaces":[
                 {
-                    "dhcpServerConnectPoint": "of:0000000000000005/15",
-                    "serverIps": ["10.0.3.253", "2000::3fd"]
+                    "ips":[
+                        "1000::3ff/120"
+                    ],
+                    "vlan-untagged":21
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1001::3ff/120"
+                    ],
+                    "vlan-untagged":22
+                }
+            ]
+        },
+        "of:0000000000000001/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.1.0.254/24"
+                    ],
+                    "vlan-untagged":10
+                }
+            ]
+        },
+        "of:0000000000000001/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.1.10.254/24"
+                    ],
+                    "vlan-untagged":11
+                }
+            ]
+        },
+        "of:0000000000000002/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24"
+                    ],
+                    "vlan-untagged":16
+                }
+            ]
+        },
+        "of:0000000000000002/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120",
+                        "1004::3ff/120",
+                        "10.2.30.254/24",
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        121,
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1002::3ff/120"
+                    ],
+                    "vlan-untagged":23
+                }
+            ]
+        },
+        "of:0000000000000002/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120"
+                    ],
+                    "vlan-untagged":24
+                }
+            ]
+        },
+        "of:0000000000000002/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000002/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.0.254/24"
+                    ],
+                    "vlan-untagged":12
+                }
+            ]
+        },
+        "of:0000000000000003/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.30.254/24"
+                    ],
+                    "vlan-untagged":16
+                }
+            ]
+        },
+        "of:0000000000000003/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        20
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/13":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.2.40.254/24"
+                    ],
+                    "vlan-tagged":[
+                        40
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120",
+                        "1004::3ff/120",
+                        "10.2.30.254/24",
+                        "10.2.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        121,
+                        30
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1003::3ff/120"
+                    ],
+                    "vlan-untagged":24
+                }
+            ]
+        },
+        "of:0000000000000003/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1004::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        121
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1005::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        122
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000003/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1006::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        123
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "10.0.7.254/24",
+                        "2000::1ff/120",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-tagged":[
+                        110,
+                        170
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/13":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24",
+                        "2000::1ff/120"
+                    ],
+                    "vlan-untagged":110
+                }
+            ]
+        },
+        "of:0000000000000004/14":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.7.254/24",
+                        "2000::7ff/120"
+                    ],
+                    "vlan-untagged":170
+                }
+            ]
+        },
+        "of:0000000000000004/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120",
+                        "1009::3ff/120",
+                        "10.3.10.254/24",
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        124,
+                        125,
+                        50,
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1007::3ff/120"
+                    ],
+                    "vlan-untagged":25
+                }
+            ]
+        },
+        "of:0000000000000004/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000004/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.0.254/24"
+                    ],
+                    "vlan-untagged":25
+                }
+            ]
+        },
+        "of:0000000000000005/10":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/11":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.20.254/24"
+                    ],
+                    "vlan-tagged":[
+                        70
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/12":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "10.0.6.254/24",
+                        "2000::5ff/120",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-tagged":[
+                        150,
+                        160
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/13":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.5.254/24",
+                        "2000::5ff/120"
+                    ],
+                    "vlan-untagged":150
+                }
+            ]
+        },
+        "of:0000000000000005/14":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.6.254/24",
+                        "2000::6ff/120"
+                    ],
+                    "vlan-untagged":160
+                }
+            ]
+        },
+        "of:0000000000000005/15":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24",
+                        "2000::3ff/120"
+                    ],
+                    "vlan-untagged":15
+                }
+            ]
+        },
+        "of:0000000000000005/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120",
+                        "1009::3ff/120",
+                        "10.3.10.254/24",
+                        "10.3.30.254/24"
+                    ],
+                    "vlan-tagged":[
+                        124,
+                        125,
+                        50,
+                        60
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1008::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        124
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1009::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        125
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1010::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        126
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000005/9":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.3.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        50
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1011::3ff/120"
+                    ],
+                    "vlan-tagged":[
+                        127
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "1012::3ff/120"
+                    ],
+                    "vlan-untagged":26
+                }
+            ]
+        },
+        "of:0000000000000006/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.5.10.254/24"
+                    ],
+                    "vlan-tagged":[
+                        80
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000006/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.5.20.254/24"
+                    ],
+                    "vlan-untagged":35
                 }
             ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/flex.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/flex.json
index c8f1ff2..56e4860 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/flex.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/flex.json
@@ -1,460 +1,652 @@
 {
-    "ports" : {
-        "of:0000000000000205/1" : {
-    	    "interfaces" : [{
-    		    "ips" : [ "10.0.205.254/24" ],
-    		    "vlan-untagged": 205
-    	    }]
-    	},
-        "of:0000000000000205/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.205.254/24" ],
-                "vlan-untagged": 205
-            }]
-        },
-        "of:0000000000000206/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.206.254/24" ],
-                "vlan-untagged": 206
-            }]
-        },
-        "of:0000000000000206/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.206.254/24" ],
-                "vlan-untagged": 206
-            }]
-        },
-        "of:0000000000000203/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000203/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-tagged": [204]
-            }]
-        },
-        "of:0000000000000204/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-untagged": 204
-            }]
-        },
-        "of:0000000000000204/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.204.254/24" ],
-                "vlan-tagged": [204]
-            }]
-        },
-        "of:0000000000000201/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000201/17" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.101.254/24" ],
-                "vlan-untagged": 101
-            }]
-        },
-        "of:0000000000000201/18" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.101.254/24" ],
-                "vlan-untagged": 101
-            }]
-        },
-        "of:0000000000000201/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-tagged": [202]
-            }]
-        },
-        "of:0000000000000202/1" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/2" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/3" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/4" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/5" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/6" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/7" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/8" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-untagged": 202
-            }]
-        },
-        "of:0000000000000202/17" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.102.254/24" ],
-                "vlan-untagged": 102
-            }]
-        },
-        "of:0000000000000202/18" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.102.254/24" ],
-                "vlan-untagged": 102
-            }]
-        },
-        "of:0000000000000202/20" : {
-            "interfaces" : [{
-                "ips" : [ "10.0.202.254/24" ],
-                "vlan-tagged": [202]
-            }]
+    "apps":{
+        "org.onosproject.dhcprelay":{
+            "default":[
+                {
+                    "dhcpServerConnectPoint":"of:0000000000000204/8",
+                    "serverIps":[
+                        "10.0.204.8"
+                    ]
+                }
+            ]
         }
     },
-    "devices" : {
-        "of:0000000000000201" : {
-	        "basic" : {
-	    	    "name": "201-qmx",
-	    	    "latitude" : 34,
-	    	    "longitude": -95
-	        },
-            "segmentrouting" : {
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.201",
-                "ipv6NodeSid" : 201,
-                "ipv6Loopback" : "2000::c0a8:0201",
-                "routerMac" : "00:00:02:01:02:02",
-	    	    "pairDeviceId" : "of:0000000000000202",
-	    	    "pairLocalPort" : 20,
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
-                }
+    "devices":{
+        "of:0000000000000201":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-95,
+                "name":"201-qmx"
             },
-	    "of:0000000000000202" : {
-	        "basic" : {
-	    	    "name": "202-qmx",
-	    	    "latitude" : 34,
-	    	    "longitude": -90
-	        },
-	        "segmentrouting" : {
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.202",
-                "ipv6NodeSid" : 202,
-                "ipv6Loopback" : "2000::c0a8:0202",
-                "routerMac" : "00:00:02:01:02:02",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000201",
-                "pairLocalPort" : 20,
-	    	    "adjacencySids" : []
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.201",
+                "ipv4NodeSid":201,
+                "ipv6Loopback":"2000::c0a8:0201",
+                "ipv6NodeSid":201,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000202",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:01:02:02"
             }
         },
-        "of:0000000000000203" : {
-	        "basic" : {
-	            "name": "203-qmx",
-	            "latitude" : 34,
-	            "longitude": -108
-	        },
-            "segmentrouting" : {
-                "name" : "Leaf2-R1",
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.203",
-                "ipv6NodeSid" : 203,
-                "ipv6Loopback" : "2000::c0a8:0203",
-                "routerMac" : "00:00:02:03:02:04",
-                "isEdgeRouter" : true,
-                "pairDeviceId" : "of:0000000000000204",
-                "pairLocalPort" : 20,
-                "adjacencySids" : []
+        "of:0000000000000202":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-90,
+                "name":"202-qmx"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.202",
+                "ipv4NodeSid":202,
+                "ipv6Loopback":"2000::c0a8:0202",
+                "ipv6NodeSid":202,
+                "isEdgeRouter":true,
+                "pairDeviceId":"of:0000000000000201",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:01:02:02"
             }
         },
-        "of:0000000000000204" : {
-	        "basic" : {
-	            "name": "204-qmx",
-	            "latitude" : 34,
-	            "longitude": -103
-	        },
-            "segmentrouting" : {
-                "name" : "Leaf1-R1",
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.204",
-                "ipv6NodeSid" : 204,
-                "ipv6Loopback" : "2000::c0a8:0204",
-                "routerMac" : "00:00:02:03:02:04",
-                "pairDeviceId" : "of:0000000000000203",
-                "pairLocalPort" : 20,
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000203":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-108,
+                "name":"203-qmx"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.203",
+                "ipv4NodeSid":203,
+                "ipv6Loopback":"2000::c0a8:0203",
+                "ipv6NodeSid":203,
+                "isEdgeRouter":true,
+                "name":"Leaf2-R1",
+                "pairDeviceId":"of:0000000000000204",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:03:02:04"
             }
         },
-   	    "of:0000000000000225" : {
-	        "basic" : {
-	    	    "name": "225-t2",
-	    	    "latitude" : 42,
-	    	    "longitude": -100
-	        },
-        	"segmentrouting" : {
-                "name" : "SpineToma-0",
-                "ipv4NodeSid" : 225,
-                "ipv4Loopback" : "192.168.0.225",
-	    	    "ipv6NodeSid" : 225,
-                "ipv6Loopback" : "2000::c0a8:0225",
-                "routerMac" : "00:00:02:25:00:01",
-                "isEdgeRouter" : false,
-	    	    "adjacencySids" : []
-            }
-        },
-        "of:0000000000000226" : {
-	        "basic" : {
-	    	    "name": "226-tmhk",
-	    	    "latitude" : 42,
-	    	    "longitude": -95
-	        },
-            "segmentrouting" : {
-                "name" : "Spine1",
-                "ipv4NodeSid" : 226,
-                "ipv4Loopback" : "192.168.0.226",
-                "ipv6NodeSid" : 226,
-                "ipv6Loopback" : "2000::c0a8:0226",
-                "routerMac" : "00:00:02:26:00:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000204":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":34,
+                "longitude":-103,
+                "name":"204-qmx"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.204",
+                "ipv4NodeSid":204,
+                "ipv6Loopback":"2000::c0a8:0204",
+                "ipv6NodeSid":204,
+                "isEdgeRouter":true,
+                "name":"Leaf1-R1",
+                "pairDeviceId":"of:0000000000000203",
+                "pairLocalPort":20,
+                "routerMac":"00:00:02:03:02:04"
             }
         },
         "of:0000000000000205":{
             "basic":{
-                "name":"205-qmx",
+                "driver":"ofdpa-ovs",
                 "latitude":34,
-                "longitude":-120
+                "longitude":-120,
+                "name":"205-qmx"
             },
             "segmentrouting":{
-                "name":"Leaf1",
-                "ipv4NodeSid":205,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.205",
-                "ipv6NodeSid":205,
+                "ipv4NodeSid":205,
                 "ipv6Loopback":"2000::c0a8:0205",
-                "routerMac":"00:00:02:05:06:01",
+                "ipv6NodeSid":205,
                 "isEdgeRouter":true,
-                "adjacencySids":[
-                ]
+                "name":"Leaf1",
+                "routerMac":"00:00:02:05:06:01"
             }
         },
         "of:0000000000000206":{
             "basic":{
-                "name":"206-qmx",
+                "driver":"ofdpa-ovs",
                 "latitude":34,
-                "longitude":-115
+                "longitude":-115,
+                "name":"206-qmx"
             },
             "segmentrouting":{
-                "name":"Leaf2",
-                "ipv4NodeSid":206,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.206",
-                "ipv6NodeSid":206,
+                "ipv4NodeSid":206,
                 "ipv6Loopback":"2000::c0a8:0206",
-                "routerMac":"00:00:02:06:06:01",
+                "ipv6NodeSid":206,
                 "isEdgeRouter":true,
-                "adjacencySids":[
-                ]
+                "name":"Leaf2",
+                "routerMac":"00:00:02:06:06:01"
+            }
+        },
+        "of:0000000000000225":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-100,
+                "name":"225-t2"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.225",
+                "ipv4NodeSid":225,
+                "ipv6Loopback":"2000::c0a8:0225",
+                "ipv6NodeSid":225,
+                "isEdgeRouter":false,
+                "name":"SpineToma-0",
+                "routerMac":"00:00:02:25:00:01"
+            }
+        },
+        "of:0000000000000226":{
+            "basic":{
+                "driver":"ofdpa-ovs",
+                "latitude":42,
+                "longitude":-95,
+                "name":"226-tmhk"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.226",
+                "ipv4NodeSid":226,
+                "ipv6Loopback":"2000::c0a8:0226",
+                "ipv6NodeSid":226,
+                "isEdgeRouter":false,
+                "name":"Spine1",
+                "routerMac":"00:00:02:26:00:01"
             }
         },
         "of:0000000000000227":{
             "basic":{
-                "name":"227-tmhk",
+                "driver":"ofdpa-ovs",
                 "latitude":38,
-                "longitude":-119
+                "longitude":-119,
+                "name":"227-tmhk"
             },
             "segmentrouting":{
-                "name":"Spine1",
-                "ipv4NodeSid":227,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.227",
-                "ipv6NodeSid":227,
+                "ipv4NodeSid":227,
                 "ipv6Loopback":"2000::c0a8:0227",
-                "routerMac":"00:00:02:27:00:01",
+                "ipv6NodeSid":227,
                 "isEdgeRouter":false,
-                "adjacencySids":[
-                ]
+                "name":"Spine1",
+                "routerMac":"00:00:02:27:00:01"
             }
         },
         "of:0000000000000228":{
             "basic":{
-                "name":"228-t2",
+                "driver":"ofdpa-ovs",
                 "latitude":38,
-                "longitude":-116
+                "longitude":-116,
+                "name":"228-t2"
             },
             "segmentrouting":{
-                "name":"Spine2",
-                "ipv4NodeSid":228,
+                "adjacencySids":[],
                 "ipv4Loopback":"192.168.0.228",
-                "ipv6NodeSid":228,
+                "ipv4NodeSid":228,
                 "ipv6Loopback":"2000::c0a8:0228",
-                "routerMac":"00:00:02:28:00:01",
+                "ipv6NodeSid":228,
                 "isEdgeRouter":false,
-                "adjacencySids":[
-                ]
+                "name":"Spine2",
+                "routerMac":"00:00:02:28:00:01"
             }
         }
     },
-    "apps" : {
-            "org.onosproject.dhcprelay" : {
-    	    "default" : [
-    		    {
-                    "dhcpServerConnectPoint": "of:0000000000000204/8",
-                    "serverIps": ["10.0.204.8"]
-    		    }
-    	    ]
+    "ports":{
+        "of:0000000000000201/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/17":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.101.254/24"
+                    ],
+                    "vlan-untagged":101
+                }
+            ]
+        },
+        "of:0000000000000201/18":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.101.254/24"
+                    ],
+                    "vlan-untagged":101
+                }
+            ]
+        },
+        "of:0000000000000201/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-tagged":[
+                        202
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000201/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000201/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/17":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.102.254/24"
+                    ],
+                    "vlan-untagged":102
+                }
+            ]
+        },
+        "of:0000000000000202/18":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.102.254/24"
+                    ],
+                    "vlan-untagged":102
+                }
+            ]
+        },
+        "of:0000000000000202/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-tagged":[
+                        202
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000202/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000202/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.202.254/24"
+                    ],
+                    "vlan-untagged":202
+                }
+            ]
+        },
+        "of:0000000000000203/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-tagged":[
+                        204
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000203/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000203/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/20":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-tagged":[
+                        204
+                    ]
+                }
+            ]
+        },
+        "of:0000000000000204/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/5":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/6":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/7":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000204/8":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.204.254/24"
+                    ],
+                    "vlan-untagged":204
+                }
+            ]
+        },
+        "of:0000000000000205/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.205.254/24"
+                    ],
+                    "vlan-untagged":205
+                }
+            ]
+        },
+        "of:0000000000000205/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.205.254/24"
+                    ],
+                    "vlan-untagged":205
+                }
+            ]
+        },
+        "of:0000000000000206/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.206.254/24"
+                    ],
+                    "vlan-untagged":206
+                }
+            ]
+        },
+        "of:0000000000000206/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.206.254/24"
+                    ],
+                    "vlan-untagged":206
+                }
+            ]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1-xconnects.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1-xconnects.json
new file mode 100644
index 0000000..09e63c4
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1-xconnects.json
@@ -0,0 +1,28 @@
+{
+    "xconnects":[
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "8"
+            ],
+            "vlanId":10
+        },
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "7"
+            ],
+            "vlanId":5
+        },
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "6"
+            ],
+            "vlanId":1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1.json
index 2b78717..65a03b8 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1.json
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/0x1.json
@@ -1,63 +1,81 @@
 {
-    "ports" : {
-    "of:0000000000000001/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/3" : {
-      "interfaces" : [
-        {
-          "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-      ]
-    },
-    "of:0000000000000001/4" : {
-      "interfaces" : [
-        {
-          "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-      ]
-    }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R1",
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "10:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":true,
+                "name":"Leaf-R1",
+                "routerMac":"10:00:00:00:00:01"
             }
         }
     },
-    "hosts" : {
-        "00:00:00:00:00:01/-1" : {
-            "basic": {
-                "ips": ["10.0.1.1"],
-                "locations": ["of:0000000000000001/1"]
+    "hosts":{
+        "00:00:00:00:00:01/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/1"
+                ]
             }
         },
-        "00:00:00:00:00:02/-1" : {
-            "basic": {
-                "ips": ["10.0.1.2"],
-                "locations": ["of:0000000000000001/2"]
+        "00:00:00:00:00:02/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2-xconnects.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2-xconnects.json
new file mode 100644
index 0000000..09e63c4
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2-xconnects.json
@@ -0,0 +1,28 @@
+{
+    "xconnects":[
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "8"
+            ],
+            "vlanId":10
+        },
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "7"
+            ],
+            "vlanId":5
+        },
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "6"
+            ],
+            "vlanId":1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2.json
index 7c9b5db..4b2ca04 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2.json
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/2x2.json
@@ -1,124 +1,160 @@
 {
-    "ports" : {
-    "of:0000000000000001/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/3" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/4" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000002/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.2.254/24" ],
-            "vlan-untagged" : 200
-        }
-        ]
-    },
-    "of:0000000000000002/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.2.254/24" ],
-            "vlan-untagged" : 200
-        }
-        ]
-    }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R1",
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "10:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "name":"Leaf-R1",
+                "routerMac":"10:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R2",
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "10:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "name":"Leaf-R2",
+                "routerMac":"10:00:00:00:00:02"
             }
         },
-        "of:0000000000000101" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Spine-R1",
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "10:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "name":"Spine-R1",
+                "routerMac":"10:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Spine-R2",
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "10:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "name":"Spine-R2",
+                "routerMac":"10:00:00:00:01:02"
             }
         }
     },
-    "hosts" : {
-        "00:00:00:00:00:01/-1" : {
-            "basic": {
-                "ips": ["10.0.1.1"],
-                "locations": ["of:0000000000000001/1"]
+    "hosts":{
+        "00:00:00:00:00:01/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/1"
+                ]
             }
         },
-        "00:00:00:00:00:02/-1" : {
-            "basic": {
-                "ips": ["10.0.1.2"],
-                "locations": ["of:0000000000000001/2"]
+        "00:00:00:00:00:02/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
             }
         },
-        "00:00:00:00:00:03/-1" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000002/1"]
+        "00:00:00:00:00:03/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000002/1"
+                ]
             }
         },
-        "00:00:00:00:00:04/-1" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000002/2"]
+        "00:00:00:00:00:04/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000002/2"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000002/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":200
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":200
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4-xconnects.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4-xconnects.json
new file mode 100644
index 0000000..09e63c4
--- /dev/null
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4-xconnects.json
@@ -0,0 +1,28 @@
+{
+    "xconnects":[
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "8"
+            ],
+            "vlanId":10
+        },
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "7"
+            ],
+            "vlanId":5
+        },
+        {
+            "deviceId":"of:0000000000000001",
+            "endpoints":[
+                "5",
+                "6"
+            ],
+            "vlanId":1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4.json
index e3c24e6..8ca4097 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4.json
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/4x4.json
@@ -1,224 +1,292 @@
 {
-    "ports" : {
-    "of:0000000000000001/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-        }
-        ]
-    },
-    "of:0000000000000001/3" : {
-        "interfaces" : [
-            {
-                "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-            }
-        ]
-    },
-    "of:0000000000000001/4" : {
-        "interfaces" : [
-            {
-                "ips" : [ "10.0.1.254/24" ],
-            "vlan-untagged" : 100
-            }
-        ]
-    },
-    "of:0000000000000002/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.2.254/24" ],
-            "vlan-untagged" : 200
-        }
-        ]
-    },
-    "of:0000000000000002/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.2.254/24" ],
-            "vlan-untagged" : 200
-        }
-        ]
-    },
-    "of:0000000000000003/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.3.254/24" ],
-            "vlan-untagged" : 300
-        }
-        ]
-    },
-    "of:0000000000000003/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.3.254/24" ],
-            "vlan-untagged" : 300
-        }
-        ]
-    },
-    "of:0000000000000004/1" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.4.254/24" ],
-            "vlan-untagged" : 400
-        }
-        ]
-    },
-    "of:0000000000000004/2" : {
-        "interfaces" : [
-        {
-            "ips" : [ "10.0.4.254/24"],
-            "vlan-untagged" : 400
-        }
-        ]
-    }
-    },
-    "devices" : {
-        "of:0000000000000001" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R1",
-                "ipv4NodeSid" : 201,
-                "ipv4Loopback" : "192.168.0.1",
-                "routerMac" : "10:00:00:00:00:01",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+    "devices":{
+        "of:0000000000000001":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.1",
+                "ipv4NodeSid":201,
+                "isEdgeRouter":true,
+                "name":"Leaf-R1",
+                "routerMac":"10:00:00:00:00:01"
             }
         },
-        "of:0000000000000002" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R2",
-                "ipv4NodeSid" : 202,
-                "ipv4Loopback" : "192.168.0.2",
-                "routerMac" : "10:00:00:00:00:02",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000002":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.2",
+                "ipv4NodeSid":202,
+                "isEdgeRouter":true,
+                "name":"Leaf-R2",
+                "routerMac":"10:00:00:00:00:02"
             }
         },
-        "of:0000000000000003" : {
-            "basic" :{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R3",
-                "ipv4NodeSid" : 203,
-                "ipv4Loopback" : "192.168.0.3",
-                "routerMac" : "10:00:00:00:00:03",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000003":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.3",
+                "ipv4NodeSid":203,
+                "isEdgeRouter":true,
+                "name":"Leaf-R3",
+                "routerMac":"10:00:00:00:00:03"
             }
         },
-        "of:0000000000000004" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Leaf-R4",
-                "ipv4NodeSid" : 204,
-                "ipv4Loopback" : "192.168.0.4",
-                "routerMac" : "10:00:00:00:00:04",
-                "isEdgeRouter" : true,
-                "adjacencySids" : []
+        "of:0000000000000004":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.4",
+                "ipv4NodeSid":204,
+                "isEdgeRouter":true,
+                "name":"Leaf-R4",
+                "routerMac":"10:00:00:00:00:04"
             }
         },
-        "of:0000000000000101" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Spine-R1",
-                "ipv4NodeSid" : 101,
-                "ipv4Loopback" : "192.168.0.101",
-                "routerMac" : "10:00:00:00:01:01",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000101":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.101",
+                "ipv4NodeSid":101,
+                "isEdgeRouter":false,
+                "name":"Spine-R1",
+                "routerMac":"10:00:00:00:01:01"
             }
         },
-        "of:0000000000000102" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Spine-R2",
-                "ipv4NodeSid" : 102,
-                "ipv4Loopback" : "192.168.0.102",
-                "routerMac" : "10:00:00:00:01:02",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000102":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.102",
+                "ipv4NodeSid":102,
+                "isEdgeRouter":false,
+                "name":"Spine-R2",
+                "routerMac":"10:00:00:00:01:02"
             }
         },
-        "of:0000000000000103" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Spine-R3",
-                "ipv4NodeSid" : 103,
-                "ipv4Loopback" : "192.168.0.103",
-                "routerMac" : "10:00:00:00:01:03",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000103":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.103",
+                "ipv4NodeSid":103,
+                "isEdgeRouter":false,
+                "name":"Spine-R3",
+                "routerMac":"10:00:00:00:01:03"
             }
         },
-        "of:0000000000000104" : {
-            "basic":{ "driver" : "ofdpa-ovs" },
-            "segmentrouting" : {
-                "name" : "Spine-R4",
-                "ipv4NodeSid" : 104,
-                "ipv4Loopback" : "192.168.0.104",
-                "routerMac" : "10:00:00:00:01:04",
-                "isEdgeRouter" : false,
-                "adjacencySids" : []
+        "of:0000000000000104":{
+            "basic":{
+                "driver":"ofdpa-ovs"
+            },
+            "segmentrouting":{
+                "adjacencySids":[],
+                "ipv4Loopback":"192.168.0.104",
+                "ipv4NodeSid":104,
+                "isEdgeRouter":false,
+                "name":"Spine-R4",
+                "routerMac":"10:00:00:00:01:04"
             }
         }
     },
-    "hosts" : {
-        "00:00:00:00:00:01/-1" : {
-            "basic": {
-                "ips": ["10.0.1.1"],
-                "locations": ["of:0000000000000001/1"]
+    "hosts":{
+        "00:00:00:00:00:01/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/1"
+                ]
             }
         },
-        "00:00:00:00:00:02/-1" : {
-            "basic": {
-                "ips": ["10.0.1.2"],
-                "locations": ["of:0000000000000001/2"]
+        "00:00:00:00:00:02/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.2"
+                ],
+                "locations":[
+                    "of:0000000000000001/2"
+                ]
             }
         },
-        "00:00:00:00:00:03/-1" : {
-            "basic": {
-                "ips": ["10.0.2.1"],
-                "locations": ["of:0000000000000002/1"]
+        "00:00:00:00:00:03/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.2.1"
+                ],
+                "locations":[
+                    "of:0000000000000002/1"
+                ]
             }
         },
-        "00:00:00:00:00:04/-1" : {
-            "basic": {
-                "ips": ["10.0.2.2"],
-                "locations": ["of:0000000000000002/2"]
+        "00:00:00:00:00:04/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.2.2"
+                ],
+                "locations":[
+                    "of:0000000000000002/2"
+                ]
             }
         },
-        "00:00:00:00:00:05/-1" : {
-            "basic": {
-                "ips": ["10.0.3.1"],
-                "locations": ["of:0000000000000003/1"]
+        "00:00:00:00:00:05/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.3.1"
+                ],
+                "locations":[
+                    "of:0000000000000003/1"
+                ]
             }
         },
-        "00:00:00:00:00:06/-1" : {
-            "basic": {
-                "ips": ["10.0.3.2"],
-                "locations": ["of:0000000000000003/2"]
+        "00:00:00:00:00:06/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.3.2"
+                ],
+                "locations":[
+                    "of:0000000000000003/2"
+                ]
             }
         },
-        "00:00:00:00:00:07/-1" : {
-            "basic": {
-                "ips": ["10.0.4.1"],
-                "locations": ["of:0000000000000004/1"]
+        "00:00:00:00:00:07/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.4.1"
+                ],
+                "locations":[
+                    "of:0000000000000004/1"
+                ]
             }
         },
-        "00:00:00:00:00:08/-1" : {
-            "basic": {
-                "ips": ["10.0.4.2"],
-                "locations": ["of:0000000000000004/2"]
+        "00:00:00:00:00:08/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.4.2"
+                ],
+                "locations":[
+                    "of:0000000000000004/2"
+                ]
             }
         }
+    },
+    "ports":{
+        "of:0000000000000001/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/3":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000001/4":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.1.254/24"
+                    ],
+                    "vlan-untagged":100
+                }
+            ]
+        },
+        "of:0000000000000002/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":200
+                }
+            ]
+        },
+        "of:0000000000000002/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.2.254/24"
+                    ],
+                    "vlan-untagged":200
+                }
+            ]
+        },
+        "of:0000000000000003/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":300
+                }
+            ]
+        },
+        "of:0000000000000003/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.3.254/24"
+                    ],
+                    "vlan-untagged":300
+                }
+            ]
+        },
+        "of:0000000000000004/1":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.4.254/24"
+                    ],
+                    "vlan-untagged":400
+                }
+            ]
+        },
+        "of:0000000000000004/2":{
+            "interfaces":[
+                {
+                    "ips":[
+                        "10.0.4.254/24"
+                    ],
+                    "vlan-untagged":400
+                }
+            ]
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/json/extra.json b/TestON/tests/USECASE/SegmentRouting/dependencies/json/extra.json
index e3544bf..1b9bc89 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/json/extra.json
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/json/extra.json
@@ -1,16 +1,24 @@
 {
-    "hosts" : {
-        "00:00:00:00:00:09/-1" : {
-            "basic": {
-                "ips": ["10.0.1.9"],
-                "locations": ["of:0000000000000001/3"]
+    "hosts":{
+        "00:00:00:00:00:09/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.1.9"
+                ],
+                "locations":[
+                    "of:0000000000000001/3"
+                ]
             }
         },
-        "00:00:00:00:09:01/-1" : {
-            "basic": {
-                "ips": ["10.0.9.1"],
-                "locations": ["of:0000000000000001/4"]
+        "00:00:00:00:09:01/-1":{
+            "basic":{
+                "ips":[
+                    "10.0.9.1"
+                ],
+                "locations":[
+                    "of:0000000000000001/4"
+                ]
             }
         }
     }
-}
+}
\ No newline at end of file