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/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