From 76dc892491948adae5e5e62cf94448967e8d865b Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Sun, 6 Dec 2015 07:15:03 -0800 Subject: Fixes bad POM file with ONOS commit 8c68536972f63069c263635c9d9f4f31d7f3e9a2 Change-Id: I7adb5a2d3738d53dbc41db7577768b0e7ced5450 Signed-off-by: Ashlee Young --- .../tools/package/config/samples/network-cfg.json | 109 ++++++++++++--------- 1 file changed, 64 insertions(+), 45 deletions(-) (limited to 'framework/src/onos/tools/package/config/samples/network-cfg.json') diff --git a/framework/src/onos/tools/package/config/samples/network-cfg.json b/framework/src/onos/tools/package/config/samples/network-cfg.json index 9e9257e0..f6879f07 100644 --- a/framework/src/onos/tools/package/config/samples/network-cfg.json +++ b/framework/src/onos/tools/package/config/samples/network-cfg.json @@ -1,67 +1,86 @@ { "ports" : { - "of:0000000000000002/1" : { - "interfaces" : [ - { - "ips" : [ "192.168.10.101/24" ], - "mac" : "08:9e:01:82:38:68", - "vlan" : "100" - } - ] - }, - "of:0000000000000002/20" : { - "interfaces" : [ - { - "ips" : [ "192.168.20.101/24" ], - "mac" : "08:9e:01:82:38:68", - "vlan" : "200" - } - ] - } + "of:0000000000000002/1" : { + "interfaces" : [ + { + "ips" : [ "192.168.10.101/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "100" + } + ] + }, + "of:0000000000000002/2" : { + "interfaces" : [ + { + "ips" : [ "192.168.20.101/24" ], + "mac" : "08:9e:01:82:38:68", + "vlan" : "200" + } + ] + } }, "devices" : { - "of:0000000000000002" : { - "segmentrouting" : { + "of:0000000000000002" : { + "segmentrouting" : { "name" : "Leaf-R1", "nodeSid" : 101, "routerIp" : "10.0.1.254", "routerMac" : "00:00:00:00:01:80", "isEdgeRouter" : true, "adjacencySids" : [ - { "sid" : 100, "ports" : [2, 3] }, - { "sid" : 200, "ports" : [4, 5] } + { "adjSids" : 100, "ports" : [2, 3] }, + { "adjSids" : 200, "ports" : [4, 5] } ] } - }, - "of:0000000000000191" : { - "segmentrouting" : { + }, + "of:0000000000000191" : { + "segmentrouting" : { "name" : "Spine-R1", "nodeSid" : 105, "routerIp" : "192.168.0.11", "routerMac" : "00:00:01:00:11:80", - "isEdgeRouter" : false + "isEdgeRouter" : false, + "adjacencySids" : [] } - } + } }, "apps" : { - "org.onosproject.router" : { - "bgp" : { - "bgpSpeakers" : [ - { - "connectPoint" : "of:00000000000000aa/10", - "peers" : [ - "192.168.10.1" - ] - }, - { - "connectPoint" : "of:00000000000000aa/20", - "peers" : [ - "192.168.20.1" - ] - } - ] - } - } + "org.onosproject.router" : { + "bgp" : { + "bgpSpeakers" : [ + { + "connectPoint" : "of:00000000000000aa/10", + "peers" : [ + "192.168.10.1" + ] + }, + { + "connectPoint" : "of:00000000000000aa/20", + "peers" : [ + "192.168.20.1" + ] + } + ] + } + } + }, + "hosts" : { + "00:00:00:00:00:01/4093": { + "basic": { + "ips": [ + "10.0.1.1" + ], + "location": "of:0000000000000001/3" + } + }, + "00:00:00:00:00:02/4093": { + "basic": { + "ips": [ + "10.0.1.2" + ], + "location": "of:0000000000000001/4" + } + } } } -- cgit 1.2.3-korg