diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
index 8d69443..27b6dd0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/SRMulticastTest.py
@@ -37,7 +37,7 @@
     lib.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
     # Load configuration files
     main.step( "Load configurations" )
-    main.cfgName = "TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1"
+    main.cfgName = "TEST_CONFIG_ipv4=1_ipv6=1"
     lib.loadJson( main )
     time.sleep( float( main.params[ "timers" ][ "loadNetcfgSleep" ] ) )
     main.cfgName = "common"
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf
index 34472bb..d4f09ea 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp1.conf
@@ -6,4 +6,4 @@
 !
 ip route 0.0.0.0/0 172.16.0.1
 !
-fpm connection ip 10.192.19.121 port 2620
+fpm connection ip 10.128.100.67 port 2620
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf
index 9c6e3f4..95e97fd 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/conf/zebradbgp2.conf
@@ -6,4 +6,4 @@
 !
 ip route 0.0.0.0/0 172.16.0.1
 !
-fpm connection ip 10.192.19.122 port 2620
+fpm connection ip 10.128.100.69 port 2620
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host
index c0dd913..bdcf863 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/host/common.host
@@ -4,7 +4,7 @@
         "00:AA:00:00:00:02/None": "10.2.0.1",
         "00:AA:00:00:00:03/None": "10.2.30.1",
         "00:AA:00:00:00:06/None": "10.3.0.1",
-        "00:AA:00:00:00:08/40": "10.3.30.1",
+        "00:AA:00:00:00:08/60": "10.3.30.1",
         "00:BB:00:00:00:01/None": "1000::3fe",
         "00:BB:00:00:00:02/None": "1002::3fe"
     },
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
similarity index 83%
rename from TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
rename to TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
index 7c6b51e..3098edf 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/json/TEST_CONFIG_ipv4=1_ipv6=1.json
@@ -1,10 +1,10 @@
 {
     "ports" : {
-         "of:0000000000000006/3" : {
+	"of:0000000000000006/3" : {
             "interfaces" : [
                 {
                     "ips" : [ "1011::3ff/120" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [127]
                 }
             ]
         },
@@ -12,15 +12,15 @@
             "interfaces" : [
                 {
                     "ips" : [ "1012::3ff/120" ],
-                    "vlan-untagged": 20
+                    "vlan-untagged": 26
                 }
             ]
-        },
+        },       
 	"of:0000000000000006/5" : {
             "interfaces" : [
                 {
                     "ips" : [ "10.5.10.254/24" ],
-                    "vlan-tagged": [10]
+                    "vlan-tagged": [80]
                 }
             ]
         },
@@ -28,16 +28,47 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.5.20.254/24" ],
-                    "vlan-untagged": 20
+                    "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": 10
+                    "vlan-untagged": 21
                 }
             ]
         },
@@ -45,7 +76,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1001::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 22
                 }
             ]
         },
@@ -61,7 +92,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.1.10.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 11
                 }
             ]
         },
@@ -69,7 +100,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1002::3ff/120" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 23
                 }
             ]
         },
@@ -77,7 +108,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -85,7 +116,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
         },
@@ -93,7 +124,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.0.254/24" ],
-                    "vlan-untagged": 10
+                    "vlan-untagged": 12
                 }
             ]
         },
@@ -117,7 +148,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1003::3ff/120" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 24
                 }
             ]
         },
@@ -125,15 +156,15 @@
             "interfaces" : [
                 {
                     "ips" : [ "1004::3ff/120" ],
-                    "vlan-tagged": [30]
+                    "vlan-tagged": [121]
                 }
             ]
-        },
+        }, 
         "of:0000000000000003/8" : {
             "interfaces" : [
                 {
                     "ips" : [ "1005::3ff/120" ],
-                    "vlan-tagged": [20]
+                    "vlan-tagged": [122]
                 }
             ]
         },
@@ -141,7 +172,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1006::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [123]
                 }
             ]
         },
@@ -149,7 +180,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.2.30.254/24" ],
-                    "vlan-untagged": 15
+                    "vlan-untagged": 16
                 }
             ]
         },
@@ -160,7 +191,7 @@
                     "vlan-tagged": [30]
                 }
             ]
-        },
+        }, 
         "of:0000000000000003/12" : {
             "interfaces" : [
                 {
@@ -181,7 +212,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1007::3ff/120" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -189,7 +220,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -197,7 +228,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -205,7 +236,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.0.254/24" ],
-                    "vlan-untagged": 30
+                    "vlan-untagged": 25
                 }
             ]
         },
@@ -213,7 +244,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -221,7 +252,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -256,7 +287,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1008::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [124]
                 }
             ]
         },
@@ -264,7 +295,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1009::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [125]
                 }
             ]
         },
@@ -272,7 +303,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "1010::3ff/120" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [126]
                 }
             ]
         },
@@ -280,7 +311,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.10.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [50]
                 }
             ]
         },
@@ -288,7 +319,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.30.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [60]
                 }
             ]
         },
@@ -296,7 +327,7 @@
             "interfaces" : [
                 {
                     "ips" : [ "10.3.20.254/24" ],
-                    "vlan-tagged": [40]
+                    "vlan-tagged": [70]
                 }
             ]
         },
@@ -333,44 +364,44 @@
             ]
         }
     },
-    "hosts" : {
-	"00:BB:00:00:01:0A/10" : {
+    "hosts" : { 
+	"00:BB:00:00:01:0A/127" : {
 		"basic": {
 			"locations": ["of:0000000000000006/3"],
 			"ips": ["1011::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:04/30" : {
+	"00:bb:00:00:00:04/121" : {
 		"basic": {
 			"locations": ["of:0000000000000003/7","of:0000000000000002/8"],
 			"ips": ["1004::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:05/20" : {
+	"00:bb:00:00:00:05/122" : {
 		"basic": {
 			"locations": ["of:0000000000000003/8"],
 			"ips": ["1005::3fe"]
 		     }
 	    },
-	"00:bb:00:00:01:05/40" : {
+	"00:bb:00:00:01:05/123" : {
 		"basic": {
 			"locations": ["of:0000000000000003/9"],
 			"ips": ["1006::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:07/40" : {
+	"00:bb:00:00:00:07/124" : {
 		"basic": {
 			"locations": ["of:0000000000000005/6", "of:0000000000000004/7"],
 			"ips": ["1008::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:08/40" : {
+	"00:bb:00:00:00:08/125" : {
 		"basic": {
 			"locations": ["of:0000000000000004/8","of:0000000000000005/7"],
 			"ips": ["1009::3fe"]
 		     }
 	    },
-	"00:bb:00:00:00:0A/40" : {
+	"00:bb:00:00:00:0A/126" : {
 		"basic": {
 			"locations": ["of:0000000000000005/8"],
 			"ips": ["1010::3fe"]
@@ -378,7 +409,7 @@
 	    }
     },
     "devices" : {
-	"of:0000000000000006" : {
+	 "of:0000000000000006" : {
             "segmentrouting" : {
                 "name" : "s006",
                 "ipv4NodeSid" : 1006,
@@ -392,7 +423,7 @@
             "basic" : {
                 "name" : "s006",
                 "driver" : "ofdpa-ovs",
-		"latitude":30,
+		"latitude":30,	
 		"longitude":-110
             }
         },
@@ -426,12 +457,12 @@
                 "adjacencySids" : []
             },
             "basic" : {
-                "name" : "s104",
+                 "name" : "s104",
                  "driver" : "ofdpa-ovs",
 		 "latitude":35,
 		 "longitude":-110
             }
-    	},
+	},
         "of:0000000000000001" : {
             "segmentrouting" : {
                 "name" : "s001",
@@ -446,7 +477,7 @@
             "basic" : {
                 "name" : "s001",
                 "driver" : "ofdpa-ovs",
-		"latitude":30,
+		"latitude":30,	
 		"longitude":-105
             }
         },
@@ -466,7 +497,7 @@
             "basic" : {
                 "name" : "s002",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,
+		"latitude":34,	
 		"longitude":-95
             }
         },
@@ -486,7 +517,7 @@
             "basic" : {
                 "name" : "s003",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,
+		"latitude":34,	
 		"longitude":-90
             }
         },
@@ -496,7 +527,7 @@
                 "ipv4NodeSid" : 1004,
                 "ipv4Loopback" : "192.168.0.4",
 		"ipv6NodeSid" : 2004,
-		"ipv6Loopback" : "2000::c0a8:0004",
+		"ipv6Loopback" : "2000::c0a8:0004",        
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
                 "pairLocalPort" : 5,
@@ -506,7 +537,7 @@
             "basic" : {
                 "name" : "s004",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,
+		"latitude":34,	
 		"longitude":-85
             }
         },
@@ -516,7 +547,7 @@
                 "ipv4NodeSid" : 1005,
                 "ipv4Loopback" : "192.168.0.5",
 		"ipv6NodeSid" : 2005,
-		"ipv6Loopback" : "2000::c0a8:0005",
+		"ipv6Loopback" : "2000::c0a8:0005", 
                 "routerMac" : "00:00:00:00:00:04",
                 "isEdgeRouter" : true,
                 "pairLocalPort" : 5,
@@ -526,7 +557,7 @@
             "basic" : {
                 "name" : "s005",
                 "driver" : "ofdpa-ovs",
-		"latitude":34,
+		"latitude":34,	
 		"longitude":-80
             }
         },
@@ -536,7 +567,7 @@
                 "ipv4NodeSid" : 1101,
                 "ipv4Loopback" : "192.168.0.101",
 		"ipv6NodeSid" : 2101,
-		"ipv6Loopback" : "2000::c0a8:0101",
+		"ipv6Loopback" : "2000::c0a8:0101", 
                 "routerMac" : "00:00:00:00:01:01",
                 "isEdgeRouter" : false,
                 "adjacencySids" : []
@@ -565,7 +596,7 @@
 		 "latitude":42,
 		 "longitude":-95
             }
-        }
+        }   
     },
     "apps" : {
         "org.onosproject.dhcprelay" : {
diff --git a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig
index 4d06609..dada847 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig
+++ b/TestON/tests/USECASE/SegmentRouting/SRMulticast/dependencies/multicast/common.multicastConfig
@@ -29,7 +29,7 @@
             },
             {
                 "host": "h10v4",
-                "id": "00:AA:00:00:00:08/40",
+                "id": "00:AA:00:00:00:08/60",
                 "dualHomed": "True"
             }
         ]