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/SRDhcprelay/dependencies/json/CASE01.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
index 9293c8e..8987807 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE01.json
@@ -1,112 +1,126 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
index da60e7e..3413501 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE02.json
@@ -1,121 +1,139 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/7",
+ "gatewayIps":[
+ "10.0.1.1"
+ ],
+ "serverIps":[
+ "10.0.99.3"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/7",
- "serverIps": ["10.0.99.3"],
- "gatewayIps": ["10.0.1.1"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
index 9293c8e..8987807 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE03.json
@@ -1,112 +1,126 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
index da60e7e..3413501 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE04.json
@@ -1,121 +1,139 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/7",
+ "gatewayIps":[
+ "10.0.1.1"
+ ],
+ "serverIps":[
+ "10.0.99.3"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/7",
- "serverIps": ["10.0.99.3"],
- "gatewayIps": ["10.0.1.1"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
index 195d497..d29b2a0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE05.json
@@ -1,118 +1,134 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
- }
- ]
- }
- },
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- }
- },
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
- {
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253"]
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
],
- "indirect": [
+ "indirect":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.252"]
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.252"
+ ]
+ }
+ ]
+ }
+ },
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
+ }
+ },
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
+ }
+ },
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
+ }
+ },
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
+ }
+ }
+ },
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
index caebe93..b3863fc 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE06.json
@@ -1,134 +1,150 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
- }
- ]
- }
- },
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- }
- },
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
- {
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253"],
- "relayAgentIps": {
- "of:0000000000000001": {
- "ipv4": "10.0.2.254"
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "relayAgentIps":{
+ "of:0000000000000001":{
+ "ipv4":"10.0.2.254"
},
- "of:0000000000000002": {
- "ipv4": "10.0.3.254"
+ "of:0000000000000002":{
+ "ipv4":"10.0.3.254"
}
- }
+ },
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
],
- "indirect": [
+ "indirect":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.252"],
- "relayAgentIps": {
- "of:0000000000000001": {
- "ipv4": "10.0.2.254"
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "relayAgentIps":{
+ "of:0000000000000001":{
+ "ipv4":"10.0.2.254"
},
- "of:0000000000000002": {
- "ipv4": "10.0.3.254"
+ "of:0000000000000002":{
+ "ipv4":"10.0.3.254"
}
- }
+ },
+ "serverIps":[
+ "10.0.3.252"
+ ]
+ }
+ ]
+ }
+ },
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
+ }
+ },
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
+ }
+ },
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
+ }
+ },
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
+ }
+ }
+ },
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
index 243f283..8106d62 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE11.json
@@ -1,112 +1,129 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253", "2000::3fd"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
index a7efeeb..07b56f3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE12.json
@@ -1,121 +1,144 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/7",
+ "gatewayIps":[
+ "10.0.1.1",
+ "2000::101"
+ ],
+ "serverIps":[
+ "10.0.99.3",
+ "2000::99fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/7",
- "serverIps": ["10.0.99.3", "2000::99fd"],
- "gatewayIps": ["10.0.1.1", "2000::101"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
index 243f283..8106d62 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE13.json
@@ -1,112 +1,129 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253", "2000::3fd"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
index a7efeeb..07b56f3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE14.json
@@ -1,121 +1,144 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/7",
+ "gatewayIps":[
+ "10.0.1.1",
+ "2000::101"
+ ],
+ "serverIps":[
+ "10.0.99.3",
+ "2000::99fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/7",
- "serverIps": ["10.0.99.3", "2000::99fd"],
- "gatewayIps": ["10.0.1.1", "2000::101"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
index b478aff..5ea58c4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE15.json
@@ -1,118 +1,138 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
- }
- ]
- }
- },
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- }
- },
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
- {
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253", "2000::3fd"]
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
],
- "indirect": [
+ "indirect":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.252", "2000::3fc"]
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.252",
+ "2000::3fc"
+ ]
+ }
+ ]
+ }
+ },
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
+ }
+ },
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
+ }
+ },
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
+ }
+ },
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
+ }
+ }
+ },
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
index 050781e..a43f8df 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE16.json
@@ -1,138 +1,158 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
- }
- ]
- }
- },
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- },
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
- },
- "basic" : {
- "driver" : "ofdpa-ovs"
- }
- }
- },
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
- {
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253", "2000::3fd"],
- "relayAgentIps": {
- "of:0000000000000001": {
- "ipv4": "10.0.2.254",
- "ipv6": "2000::2ff/120"
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "relayAgentIps":{
+ "of:0000000000000001":{
+ "ipv4":"10.0.2.254",
+ "ipv6":"2000::2ff/120"
},
- "of:0000000000000002": {
- "ipv4": "10.0.3.254",
- "ipv6": "2000::3ff/120"
+ "of:0000000000000002":{
+ "ipv4":"10.0.3.254",
+ "ipv6":"2000::3ff/120"
}
- }
+ },
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
],
- "indirect": [
+ "indirect":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.252", "2000::3fc"],
- "relayAgentIps": {
- "of:0000000000000001": {
- "ipv4": "10.0.2.254",
- "ipv6": "2000::2ff/120"
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "relayAgentIps":{
+ "of:0000000000000001":{
+ "ipv4":"10.0.2.254",
+ "ipv6":"2000::2ff/120"
},
- "of:0000000000000002": {
- "ipv4": "10.0.3.254",
- "ipv6": "2000::3ff/120"
+ "of:0000000000000002":{
+ "ipv4":"10.0.3.254",
+ "ipv6":"2000::3ff/120"
}
- }
+ },
+ "serverIps":[
+ "10.0.3.252",
+ "2000::3fc"
+ ]
+ }
+ ]
+ }
+ },
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
+ }
+ },
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
+ }
+ },
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
+ }
+ },
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
+ },
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
+ }
+ }
+ },
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
index 4547dbf..c04ed9d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE21.json
@@ -1,112 +1,134 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
index 43daa02..473c4e4 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE22.json
@@ -1,121 +1,147 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/7",
+ "gatewayIps":[
+ "10.0.1.1"
+ ],
+ "serverIps":[
+ "10.0.99.3"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/7",
- "serverIps": ["10.0.99.3"],
- "gatewayIps": ["10.0.1.1"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
index 6e14ba8..61d9522 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE31.json
@@ -1,112 +1,137 @@
{
- "ports" : {
- "of:0000000000000001/3" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-tagged": [40]
- }
- ]
- },
- "of:0000000000000001/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-tagged": [40]
- }
- ]
- },
- "of:0000000000000002/3" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-tagged": [50]
- }
- ]
- },
- "of:0000000000000002/4" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-tagged": [50]
- }
- ]
- },
- "of:0000000000000002/5" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.1.254/24", "2000::1ff/120" ],
- "vlan-untagged": 10
+ "dhcpServerConnectPoint":"of:0000000000000002/5",
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/3":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000002/5",
- "serverIps": ["10.0.3.253", "2000::3fd"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-tagged":[
+ 40
+ ]
+ }
+ ]
+ },
+ "of:0000000000000001/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-tagged":[
+ 40
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/3":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-tagged":[
+ 50
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/4":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-tagged":[
+ 50
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/5":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.1.254/24",
+ "2000::1ff/120"
+ ],
+ "vlan-untagged":10
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
index 6f42b53..e88eee7 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE41.json
@@ -1,168 +1,188 @@
{
- "ports" : {
- "of:0000000000000001/6" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000001/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-untagged": 20
- }
- ]
- },
- "of:0000000000000003/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000003/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000003/8" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000004/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000004/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
+ "dhcpServerConnectPoint":"of:0000000000000003/8",
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000002",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000002",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000001",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000001",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000003" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 203,
- "ipv4Loopback" : "192.168.0.3",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000004",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000003":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.3",
+ "ipv4NodeSid":203,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000004",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000004" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 204,
- "ipv4Loopback" : "192.168.0.4",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000003",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000004":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.4",
+ "ipv4NodeSid":204,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000003",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/6":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000003/8",
- "serverIps": ["10.0.3.253"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000001/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-untagged":20
+ }
+ ]
+ },
+ "of:0000000000000003/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000003/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000003/8":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000004/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000004/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
index a7ba265..8351afa 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE51.json
@@ -1,168 +1,190 @@
{
- "ports" : {
- "of:0000000000000001/6" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000001/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-untagged": 40
- }
- ]
- },
- "of:0000000000000003/6" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000003/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000003/8" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000004/6" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000004/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-untagged": 50
+ "dhcpServerConnectPoint":"of:0000000000000003/8",
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000002",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000002",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000001",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000001",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000003" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 203,
- "ipv4Loopback" : "192.168.0.3",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000004",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000003":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.3",
+ "ipv4NodeSid":203,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000004",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000004" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 204,
- "ipv4Loopback" : "192.168.0.4",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000003",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000004":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.4",
+ "ipv4NodeSid":204,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000003",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/6":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000003/8",
- "serverIps": ["10.0.3.253", "2000::3fd"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000001/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-untagged":40
+ }
+ ]
+ },
+ "of:0000000000000003/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000003/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000003/8":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000004/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000004/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
index f1a94e1..fd29ea3 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE61.json
@@ -1,168 +1,204 @@
{
- "ports" : {
- "of:0000000000000001/6" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000001/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.2.254/24" ],
- "vlan-tagged": [20]
- }
- ]
- },
- "of:0000000000000003/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000003/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000003/8" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-untagged": 30
- }
- ]
- },
- "of:0000000000000004/6" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
- }
- ]
- },
- "of:0000000000000004/7" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24" ],
- "vlan-tagged": [30]
+ "dhcpServerConnectPoint":"of:0000000000000003/8",
+ "serverIps":[
+ "10.0.3.253"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000002",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000002",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000001",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000001",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000003" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 203,
- "ipv4Loopback" : "192.168.0.3",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000004",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000003":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.3",
+ "ipv4NodeSid":203,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000004",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000004" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 204,
- "ipv4Loopback" : "192.168.0.4",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000003",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000004":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.4",
+ "ipv4NodeSid":204,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000003",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/6":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000003/8",
- "serverIps": ["10.0.3.253"]
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000001/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.2.254/24"
+ ],
+ "vlan-tagged":[
+ 20
+ ]
+ }
+ ]
+ },
+ "of:0000000000000003/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000003/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000003/8":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-untagged":30
+ }
+ ]
+ },
+ "of:0000000000000004/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
+ }
+ ]
+ },
+ "of:0000000000000004/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24"
+ ],
+ "vlan-tagged":[
+ 30
+ ]
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
index 0cbde04..4ee4e9d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/CASE71.json
@@ -1,168 +1,206 @@
{
- "ports" : {
- "of:0000000000000001/6" : {
- "interfaces" : [
+ "apps":{
+ "org.onosproject.dhcprelay":{
+ "default":[
{
- "ips" : [ "2000::2ff/120" ],
- "vlan-tagged": [40]
- }
- ]
- },
- "of:0000000000000001/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-tagged": [40]
- }
- ]
- },
- "of:0000000000000002/6" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-tagged": [40]
- }
- ]
- },
- "of:0000000000000002/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::2ff/120" ],
- "vlan-tagged": [40]
- }
- ]
- },
- "of:0000000000000003/6" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-tagged": [50]
- }
- ]
- },
- "of:0000000000000003/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-tagged": [50]
- }
- ]
- },
- "of:0000000000000003/8" : {
- "interfaces" : [
- {
- "ips" : [ "10.0.3.254/24", "2000::3ff/120" ],
- "vlan-untagged": 50
- }
- ]
- },
- "of:0000000000000004/6" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-tagged": [50]
- }
- ]
- },
- "of:0000000000000004/7" : {
- "interfaces" : [
- {
- "ips" : [ "2000::3ff/120" ],
- "vlan-tagged": [50]
+ "dhcpServerConnectPoint":"of:0000000000000003/8",
+ "serverIps":[
+ "10.0.3.253",
+ "2000::3fd"
+ ]
}
]
}
},
- "devices" : {
- "of:0000000000000001" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 201,
- "ipv4Loopback" : "192.168.0.1",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000002",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "devices":{
+ "of:0000000000000001":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.1",
+ "ipv4NodeSid":201,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000002",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000002" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 202,
- "ipv4Loopback" : "192.168.0.2",
- "routerMac" : "00:00:00:00:00:01",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000001",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000002":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.2",
+ "ipv4NodeSid":202,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000001",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:01"
}
},
- "of:0000000000000003" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 203,
- "ipv4Loopback" : "192.168.0.3",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000004",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000003":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.3",
+ "ipv4NodeSid":203,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000004",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000004" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 204,
- "ipv4Loopback" : "192.168.0.4",
- "routerMac" : "00:00:00:00:00:02",
- "isEdgeRouter" : true,
- "pairDeviceId" : "of:0000000000000003",
- "pairLocalPort" : 5,
- "adjacencySids" : []
+ "of:0000000000000004":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.4",
+ "ipv4NodeSid":204,
+ "isEdgeRouter":true,
+ "pairDeviceId":"of:0000000000000003",
+ "pairLocalPort":5,
+ "routerMac":"00:00:00:00:00:02"
}
},
- "of:0000000000000101" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 101,
- "ipv4Loopback" : "192.168.0.101",
- "routerMac" : "00:00:00:00:01:01",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000101":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.101",
+ "ipv4NodeSid":101,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:01"
}
},
- "of:0000000000000102" : {
- "segmentrouting" : {
- "ipv4NodeSid" : 102,
- "ipv4Loopback" : "192.168.0.102",
- "routerMac" : "00:00:00:00:01:02",
- "isEdgeRouter" : false,
- "adjacencySids" : []
+ "of:0000000000000102":{
+ "basic":{
+ "driver":"ofdpa-ovs"
},
- "basic" : {
- "driver" : "ofdpa-ovs"
+ "segmentrouting":{
+ "adjacencySids":[],
+ "ipv4Loopback":"192.168.0.102",
+ "ipv4NodeSid":102,
+ "isEdgeRouter":false,
+ "routerMac":"00:00:00:00:01:02"
}
}
},
- "apps" : {
- "org.onosproject.dhcprelay" : {
- "default": [
+ "ports":{
+ "of:0000000000000001/6":{
+ "interfaces":[
{
- "dhcpServerConnectPoint": "of:0000000000000003/8",
- "serverIps": ["10.0.3.253", "2000::3fd"]
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-tagged":[
+ 40
+ ]
+ }
+ ]
+ },
+ "of:0000000000000001/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-tagged":[
+ 40
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-tagged":[
+ 40
+ ]
+ }
+ ]
+ },
+ "of:0000000000000002/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::2ff/120"
+ ],
+ "vlan-tagged":[
+ 40
+ ]
+ }
+ ]
+ },
+ "of:0000000000000003/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-tagged":[
+ 50
+ ]
+ }
+ ]
+ },
+ "of:0000000000000003/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-tagged":[
+ 50
+ ]
+ }
+ ]
+ },
+ "of:0000000000000003/8":{
+ "interfaces":[
+ {
+ "ips":[
+ "10.0.3.254/24",
+ "2000::3ff/120"
+ ],
+ "vlan-untagged":50
+ }
+ ]
+ },
+ "of:0000000000000004/6":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-tagged":[
+ 50
+ ]
+ }
+ ]
+ },
+ "of:0000000000000004/7":{
+ "interfaces":[
+ {
+ "ips":[
+ "2000::3ff/120"
+ ],
+ "vlan-tagged":[
+ 50
+ ]
}
]
}
}
-}
+}
\ No newline at end of file
diff --git a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
index e3544bf..1b9bc89 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
+++ b/TestON/tests/USECASE/SegmentRouting/SRDhcprelay/dependencies/json/extra.json
@@ -1,16 +1,24 @@
{
- "hosts" : {
- "00:00:00:00:00:09/-1" : {
- "basic": {
- "ips": ["10.0.1.9"],
- "locations": ["of:0000000000000001/3"]
+ "hosts":{
+ "00:00:00:00:00:09/-1":{
+ "basic":{
+ "ips":[
+ "10.0.1.9"
+ ],
+ "locations":[
+ "of:0000000000000001/3"
+ ]
}
},
- "00:00:00:00:09:01/-1" : {
- "basic": {
- "ips": ["10.0.9.1"],
- "locations": ["of:0000000000000001/4"]
+ "00:00:00:00:09:01/-1":{
+ "basic":{
+ "ips":[
+ "10.0.9.1"
+ ],
+ "locations":[
+ "of:0000000000000001/4"
+ ]
}
}
}
-}
+}
\ No newline at end of file