Merge "Adding build numbers to the SCPF Trend Graphs"
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 2f3bfda..8e1108b 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -2963,7 +2963,7 @@
main.log.exception( self.name + ": Uncaught exception!" )
main.cleanAndExit()
- def getHosts( self, verbose=False, updateTimeout=1000, hostClass=[ "Host", "DhcpClient", "Dhcp6Client", "DhcpServer", "Dhcp6Server", "DhcpRelay" ] ):
+ def getHosts( self, verbose=False, updateTimeout=1000, hostClass=[ "Host", "DhcpClient", "Dhcp6Client", "DhcpServer", "Dhcp6Server", "DhcpRelay" ], getInterfaces=True ):
"""
Read hosts from Mininet.
Optional:
@@ -2997,36 +2997,37 @@
if result:
name = result.group( 'name' )
interfaces = []
- response = self.getInterfaces( name )
- # Populate interface info
- for line in response.split( "\n" ):
- if line.startswith( "name=" ):
- portVars = {}
- for var in line.split( "," ):
- key, value = var.split( "=" )
- portVars[ key ] = value
- isUp = portVars.pop( 'enabled', "True" )
- isUp = "True" in isUp
- if verbose:
- main.log.info( "Reading host port %s(%s)" %
- ( portVars[ 'name' ],
- portVars[ 'mac' ] ) )
- mac = portVars[ 'mac' ]
- if mac == 'None':
- mac = None
- ips = []
- ip = portVars[ 'ip' ]
- if ip == 'None':
- ip = None
- ips.append( ip )
- intfName = portVars[ 'name' ]
- if name == 'None':
- name = None
- interfaces.append( {
- "name": intfName,
- "ips": ips,
- "mac": str( mac ),
- "isUp": isUp } )
+ if getInterfaces:
+ response = self.getInterfaces( name )
+ # Populate interface info
+ for line in response.split( "\n" ):
+ if line.startswith( "name=" ):
+ portVars = {}
+ for var in line.split( "," ):
+ key, value = var.split( "=" )
+ portVars[ key ] = value
+ isUp = portVars.pop( 'enabled', "True" )
+ isUp = "True" in isUp
+ if verbose:
+ main.log.info( "Reading host port %s(%s)" %
+ ( portVars[ 'name' ],
+ portVars[ 'mac' ] ) )
+ mac = portVars[ 'mac' ]
+ if mac == 'None':
+ mac = None
+ ips = []
+ ip = portVars[ 'ip' ]
+ if ip == 'None':
+ ip = None
+ ips.append( ip )
+ intfName = portVars[ 'name' ]
+ if name == 'None':
+ name = None
+ interfaces.append( {
+ "name": intfName,
+ "ips": ips,
+ "mac": str( mac ),
+ "isUp": isUp } )
hosts[ name ] = { "interfaces": interfaces }
return hosts
except pexpect.EOF:
@@ -3399,7 +3400,7 @@
main.FALSE otherwise
"""
try:
- hosts = self.getHosts()
+ hosts = self.getHosts( getInterfaces=False )
if not hostList:
hostList = hosts.keys()
for hostName in hosts.keys():
diff --git a/TestON/drivers/common/cli/onosclusterdriver.py b/TestON/drivers/common/cli/onosclusterdriver.py
index af59a60..f8badd7 100755
--- a/TestON/drivers/common/cli/onosclusterdriver.py
+++ b/TestON/drivers/common/cli/onosclusterdriver.py
@@ -58,19 +58,16 @@
"""
usedDriver = False
if hasattr( self.REST, name ):
- main.log.warn( "Rest driver has attribute '%s'" % ( name ) )
if not usedDriver:
usedDriver = True
main.log.debug("Using Rest driver's attribute for '%s'" % (name))
f = getattr( self.REST, name)
if hasattr( self.CLI, name ):
- main.log.warn( "CLI driver has attribute '%s'" % ( name ) )
if not usedDriver:
usedDriver = True
main.log.debug("Using CLI driver's attribute for '%s'" % (name))
f = getattr( self.CLI, name)
if hasattr( self.Bench, name ):
- main.log.warn( "Bench driver has attribute '%s'" % ( name ) )
if not usedDriver:
usedDriver = True
main.log.debug("Using Bench driver's attribute for '%s'" % (name))
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
index 52624f7..be5ff7f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=0_routers=0.json
@@ -193,8 +193,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -210,9 +210,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -229,9 +229,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -248,9 +248,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -267,9 +267,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -286,9 +286,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -303,9 +303,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
index 8264f29..e430592 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=0.json
@@ -177,8 +177,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -194,9 +194,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -213,9 +213,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -232,9 +232,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -251,9 +251,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -270,9 +270,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -287,9 +287,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
index 293829e..030849f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1.json
@@ -228,8 +228,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -245,9 +245,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -264,9 +264,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -283,9 +283,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -302,9 +302,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -321,9 +321,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -338,9 +338,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
index 293829e..030849f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_external=1.json
@@ -228,8 +228,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -245,9 +245,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -264,9 +264,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -283,9 +283,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -302,9 +302,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -321,9 +321,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -338,9 +338,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
index 293829e..030849f 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=0_ipv6=1_dhcp=1_routers=1_static=1.json
@@ -228,8 +228,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -245,9 +245,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -264,9 +264,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -283,9 +283,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -302,9 +302,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -321,9 +321,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -338,9 +338,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
index 85e920f..1fd2664 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=0_routers=0.json
@@ -193,7 +193,7 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 1001,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -208,7 +208,7 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -225,7 +225,7 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -242,7 +242,7 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -259,7 +259,7 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -276,7 +276,7 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -291,7 +291,7 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
index 66e5103..e2e5e0e 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=0.json
@@ -133,7 +133,7 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 1001,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -148,7 +148,7 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -165,7 +165,7 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -182,7 +182,7 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -199,7 +199,7 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -216,7 +216,7 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -231,7 +231,7 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
index 59284ba..1445c94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1.json
@@ -184,7 +184,7 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 1001,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -199,7 +199,7 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -216,7 +216,7 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -233,7 +233,7 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -250,7 +250,7 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -267,7 +267,7 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -282,7 +282,7 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
index 59284ba..1445c94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_external=1.json
@@ -184,7 +184,7 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 1001,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -199,7 +199,7 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -216,7 +216,7 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -233,7 +233,7 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -250,7 +250,7 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -267,7 +267,7 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -282,7 +282,7 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
index 59284ba..1445c94 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=0_dhcp=1_routers=1_static=1.json
@@ -184,7 +184,7 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
+ "ipv4NodeSid" : 1001,
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
"isEdgeRouter" : true,
@@ -199,7 +199,7 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -216,7 +216,7 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -233,7 +233,7 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -250,7 +250,7 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -267,7 +267,7 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -282,7 +282,7 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
index 4566a0a..3d2a4d3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=0.json
@@ -297,8 +297,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -314,9 +314,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -333,9 +333,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -352,9 +352,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -371,9 +371,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -390,9 +390,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -407,9 +407,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
index 7294d8b..a6555d7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1.json
@@ -348,8 +348,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -365,9 +365,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -384,9 +384,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -403,9 +403,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -422,9 +422,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -441,9 +441,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -458,9 +458,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
index 7294d8b..a6555d7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_external=1.json
@@ -348,8 +348,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -365,9 +365,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -384,9 +384,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -403,9 +403,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -422,9 +422,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -441,9 +441,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -458,9 +458,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,
diff --git a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
index 7294d8b..a6555d7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRRouting/dependencies/json/COMCAST_CONFIG_ipv4=1_ipv6=1_dhcp=1_routers=1_static=1.json
@@ -348,8 +348,8 @@
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "s001",
- "ipv4NodeSid" : 1,
- "ipv6NodeSid" : 101,
+ "ipv4NodeSid" : 1001,
+ "ipv6NodeSid" : 2001,
"ipv6Loopback" : "2000::c0a8:0001",
"ipv4Loopback" : "192.168.0.1",
"routerMac" : "00:00:00:00:00:01",
@@ -365,9 +365,9 @@
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "s002",
- "ipv4NodeSid" : 2,
+ "ipv4NodeSid" : 1002,
"ipv4Loopback" : "192.168.0.2",
- "ipv6NodeSid" : 102,
+ "ipv6NodeSid" : 2002,
"ipv6Loopback" : "2000::c0a8:0002",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -384,9 +384,9 @@
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "s003",
- "ipv4NodeSid" : 3,
+ "ipv4NodeSid" : 1003,
"ipv4Loopback" : "192.168.0.3",
- "ipv6NodeSid" : 103,
+ "ipv6NodeSid" : 2003,
"ipv6Loopback" : "2000::c0a8:0003",
"routerMac" : "00:00:00:00:00:02",
"isEdgeRouter" : true,
@@ -403,9 +403,9 @@
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "s004",
- "ipv4NodeSid" : 4,
+ "ipv4NodeSid" : 1004,
"ipv4Loopback" : "192.168.0.4",
- "ipv6NodeSid" : 104,
+ "ipv6NodeSid" : 2004,
"ipv6Loopback" : "2000::c0a8:0004",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -422,9 +422,9 @@
"of:0000000000000005" : {
"segmentrouting" : {
"name" : "s005",
- "ipv4NodeSid" : 5,
+ "ipv4NodeSid" : 1005,
"ipv4Loopback" : "192.168.0.5",
- "ipv6NodeSid" : 105,
+ "ipv6NodeSid" : 2005,
"ipv6Loopback" : "2000::c0a8:0005",
"routerMac" : "00:00:00:00:00:04",
"isEdgeRouter" : true,
@@ -441,9 +441,9 @@
"of:0000000000000101" : {
"segmentrouting" : {
"name" : "s101",
- "ipv4NodeSid" : 101,
+ "ipv4NodeSid" : 1101,
"ipv4Loopback" : "192.168.0.101",
- "ipv6NodeSid" : 201,
+ "ipv6NodeSid" : 2101,
"ipv6Loopback" : "2000::c0a8:0101",
"routerMac" : "00:00:00:00:01:01",
"isEdgeRouter" : false,
@@ -458,9 +458,9 @@
"of:0000000000000102" : {
"segmentrouting" : {
"name" : "s102",
- "ipv4NodeSid" : 102,
+ "ipv4NodeSid" : 1102,
"ipv4Loopback" : "192.168.0.102",
- "ipv6NodeSid" : 202,
+ "ipv6NodeSid" : 2102,
"ipv6Loopback" : "2000::c0a8:0202",
"routerMac" : "00:00:00:00:01:02",
"isEdgeRouter" : false,