Json formatiing
- To reduce file churn when running tests, sort and format json files
- Add xconnect json files I forgot to add to last patch
Change-Id: I66dd757a871a50e99c78b298c5106038e9ca5eff
(cherry picked from commit 312199d2e17692f129267c3c59ba03f2cd1bef44)
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