Removing some old dependencies in bgprouter.
Fixing the ICMP handlers in a couple of apps.
Adding some sample configs.
Change-Id: Id33e0effd9452558fc4d07d78b093f0818e96d23
diff --git a/tools/package/config/samples/segmentrouting.conf b/tools/package/config/samples/segmentrouting.conf
index 8df6c3d..fca41e0 100644
--- a/tools/package/config/samples/segmentrouting.conf
+++ b/tools/package/config/samples/segmentrouting.conf
@@ -1,78 +1,95 @@
{
- "comment": " Multilayer topology description and configuration",
+ "comment": "Configuration for a 4X4 leaf-spine fabric",
"restrictSwitches": true,
"restrictLinks": true,
"switchConfig":
[
- { "nodeDpid" : "of:0000000000000001", "name": "Dallas-R1", "type": "Router_SR", "allowed": true,
+ { "nodeDpid" : "of:0000000000000001", "name": "Leaf-R1", "type": "Router_SR", "allowed": true,
"latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.1/32",
- "routerMac": "00:00:01:01:01:80",
+ "params": { "routerIp": "10.0.1.254/32",
+ "routerMac": "00:00:00:00:01:80",
"nodeSid": 101,
"isEdgeRouter" : true,
- "adjacencySids": [
- { "ports": [ 4, 5 ], "adjSid": 10234 },
- { "ports": [ 6, 7 ], "adjSid": 29019 }
- ],
"subnets": [
- { "portNo": 1, "subnetIp": "10.0.1.128/24" }
+ { "portNo": 1, "subnetIp": "10.0.1.254/24" }
]
}
},
- { "nodeDpid": "of:0000000000000002", "name": "Dallas-R2", "type": "Router_SR", "allowed": true,
+ { "nodeDpid": "of:0000000000000002", "name": "Leaf-R2", "type": "Router_SR", "allowed": true,
"latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.2/32",
- "routerMac": "00:00:02:02:02:80",
+ "params": { "routerIp": "10.0.2.254/32",
+ "routerMac": "00:00:00:00:02:80",
"nodeSid": 102,
- "isEdgeRouter" : false,
- "adjacencySids": [
- { "ports": [ 1, 2 ], "adjSid": 12453 },
- { "ports": [ 2, 3 ], "adjSid": 23333 },
- { "ports": [ 3, 1 ], "adjSid": 22233 }
- ]
+ "isEdgeRouter" : true,
+ "subnets": [
+ { "portNo": 1, "subnetIp": "10.0.2.254/24" }
+ ]
}
+
},
- { "nodeDpid": "of:0000000000000003", "name": "Dallas-R3", "type": "Router_SR", "allowed": true,
+ { "nodeDpid": "of:0000000000000003", "name": "Leaf-R3", "type": "Router_SR", "allowed": true,
"latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.3/32",
- "routerMac": "00:00:03:03:03:80",
+ "params": { "routerIp": "10.0.3.101/32",
+ "routerMac": "00:00:00:00:03:80",
"nodeSid": 103,
- "isEdgeRouter" : false
+ "isEdgeRouter" : true,
+ "subnets": [
+ { "portNo": 1, "subnetIp": "10.0.3.254/24" }
+ ]
}
- },
- { "nodeDpid": "of:0000000000000004", "name": "Dallas-R4", "type": "Router_SR", "allowed": true,
+ },
+
+ { "nodeDpid": "of:0000000000000004", "name": "Leaf-R4", "type": "Router_SR", "allowed": true,
"latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.4/32",
- "routerMac": "00:00:04:04:04:80",
+ "params": { "routerIp": "10.0.4.101/32",
+ "routerMac": "00:00:00:00:04:80",
"nodeSid": 104,
- "isEdgeRouter" : false
+ "isEdgeRouter" : true,
+ "subnets": [
+ { "portNo": 1, "subnetIp": "10.0.4.254/24" }
+ ]
}
- },
- { "nodeDpid": "of:0000000000000005", "name": "Dallas-R5", "type": "Router_SR", "allowed": true,
+ },
+
+ { "nodeDpid": "of:0000000000000191", "name": "Spine-R1", "type": "Router_SR", "allowed": true,
"latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.5/32",
- "routerMac": "00:00:05:05:05:80",
+ "params": { "routerIp": "192.168.0.11/32",
+ "routerMac": "00:00:01:00:11:80",
"nodeSid": 105,
"isEdgeRouter" : false
}
},
- { "nodeDpid": "of:0000000000000006", "name": "Dallas-R6", "type": "Router_SR", "allowed": true,
+ { "nodeDpid": "of:0000000000000192", "name": "Spine-R2", "type": "Router_SR", "allowed": true,
"latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.6/32",
- "routerMac": "00:00:07:07:07:80",
+ "params": { "routerIp": "192.168.0.22/32",
+ "routerMac": "00:00:01:00:22:80",
"nodeSid": 106,
- "isEdgeRouter" : true,
- "subnets": [
- { "portNo": 1, "subnetIp": "7.7.7.128/24" }
- ]
+ "isEdgeRouter" : false
}
- }
+ },
+ { "nodeDpid": "of:0000000000000193", "name": "Spine-R3", "type": "Router_SR", "allowed": true,
+ "latitude": 80.80, "longitude": 90.10,
+ "params": { "routerIp": "192.168.0.33/32",
+ "routerMac": "00:00:01:00:33:80",
+ "nodeSid": 107,
+ "isEdgeRouter" : false
+ }
+ },
+
+ { "nodeDpid": "of:0000000000000194", "name": "Spine-R4", "type": "Router_SR", "allowed": true,
+ "latitude": 80.80, "longitude": 90.10,
+ "params": { "routerIp": "192.168.0.44/32",
+ "routerMac": "00:00:01:00:44:80",
+ "nodeSid": 108,
+ "isEdgeRouter" : false
+ }
+ }
]
}