Minor fix for config file sample
related to CORD-200, CORD-209
- fix typo in network-cfg.json
- remove segmentrouting_dell.conf since we don't need this anymore
with the new Network Configuration Subsystem
Change-Id: I5dcb2e2e0e6b89c4770df2485a8d27fbcc05cf67
diff --git a/tools/package/config/samples/network-cfg.json b/tools/package/config/samples/network-cfg.json
index c2af8b8..9232847 100644
--- a/tools/package/config/samples/network-cfg.json
+++ b/tools/package/config/samples/network-cfg.json
@@ -28,8 +28,8 @@
"routerMac" : "00:00:00:00:01:80",
"isEdgeRouter" : true,
"adjacencySids" : [
- { "sid" : 100, "port" : [2, 3] },
- { "sid" : 200, "port" : [4, 5] }
+ { "sid" : 100, "ports" : [2, 3] },
+ { "sid" : 200, "ports" : [4, 5] }
]
}
},
diff --git a/tools/package/config/samples/segmentrouting_dell.conf b/tools/package/config/samples/segmentrouting_dell.conf
deleted file mode 100644
index be489a6..0000000
--- a/tools/package/config/samples/segmentrouting_dell.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-{
- "comment": " Multilayer topology description and configuration",
- "restrictSwitches": true,
- "restrictLinks": true,
-
- "switchConfig":
- [
- { "nodeDpid" : "of:00010001e88b9368", "name": "Dell-R1", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.1/32",
- "routerMac": "00:01:e8:8b:93:6b",
- "nodeSid": 101,
- "isEdgeRouter" : true,
- "subnets": [
- { "portNo": 46, "subnetIp": "10.200.1.1/24" }
- ]
- }
- },
-
- { "nodeDpid": "of:00010001e88b939b", "name": "Dell-R2", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.2/32",
- "routerMac": "00:01:e8:8b:93:9e",
- "nodeSid": 102,
- "isEdgeRouter" : true,
- "subnets": [
- { "portNo": 46, "subnetIp": "10.200.2.1/24" }
- ]
- }
- },
-
- { "nodeDpid": "of:00010001e88b938c", "name": "Dell-R3", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.3/32",
- "routerMac": "00:01:e8:8b:93:8f",
- "nodeSid": 103,
- "isEdgeRouter" : true,
- "subnets": [
- { "portNo": 46, "subnetIp": "10.200.3.1/24" }
- ]
- }
- },
-
- { "nodeDpid": "of:00010001e88b93ad", "name": "Dell-R4", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.4/32",
- "routerMac": "00:01:e8:8b:93:b0",
- "nodeSid": 104,
- "isEdgeRouter" : true,
- "subnets": [
- { "portNo": 46, "subnetIp": "10.200.4.1/24" }
- ]
- }
- },
-
- { "nodeDpid": "of:00010001e88b93bc", "name": "Dell-R5", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.5/32",
- "routerMac": "00:01:e8:8b:93:bf",
- "nodeSid": 105,
- "isEdgeRouter" : false
- }
- },
-
- { "nodeDpid": "of:00010001e88b93c2", "name": "Dell-R6", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.6/32",
- "routerMac": "00:01:e8:8b:93:c5",
- "nodeSid": 106,
- "isEdgeRouter" : false
- }
- },
-
- { "nodeDpid": "of:00010001e88b9398", "name": "Dell-R7", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.7/32",
- "routerMac": "00:01:e8:8b:93:9b",
- "nodeSid": 107,
- "isEdgeRouter": false
- }
- },
-
- { "nodeDpid": "of:00010001e88b27e3", "name": "Dell-R8", "type": "Router_SR", "allowed": true,
- "latitude": 80.80, "longitude": 90.10,
- "params": { "routerIp": "192.168.0.8/32",
- "routerMac": "00:01:e8:8b:27:e6",
- "nodeSid": 108,
- "isEdgeRouter": false
- }
- }
-
- ]
-}