홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles Chan
Committed by Gerrit Code Review
9ec239e2 1 parent 523d976c

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
Inline Side-by-side
Showing 2 changed files with 2 additions and 95 deletions
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
28 "routerMac" : "00:00:00:00:01:80", 28 "routerMac" : "00:00:00:00:01:80",
29 "isEdgeRouter" : true, 29 "isEdgeRouter" : true,
30 "adjacencySids" : [ 30 "adjacencySids" : [
31 - { "sid" : 100, "port" : [2, 3] }, 31 + { "sid" : 100, "ports" : [2, 3] },
32 - { "sid" : 200, "port" : [4, 5] } 32 + { "sid" : 200, "ports" : [4, 5] }
33 ] 33 ]
34 } 34 }
35 }, 35 },
......
1 -{
2 - "comment": " Multilayer topology description and configuration",
3 - "restrictSwitches": true,
4 - "restrictLinks": true,
5 -
6 - "switchConfig":
7 - [
8 - { "nodeDpid" : "of:00010001e88b9368", "name": "Dell-R1", "type": "Router_SR", "allowed": true,
9 - "latitude": 80.80, "longitude": 90.10,
10 - "params": { "routerIp": "192.168.0.1/32",
11 - "routerMac": "00:01:e8:8b:93:6b",
12 - "nodeSid": 101,
13 - "isEdgeRouter" : true,
14 - "subnets": [
15 - { "portNo": 46, "subnetIp": "10.200.1.1/24" }
16 - ]
17 - }
18 - },
19 -
20 - { "nodeDpid": "of:00010001e88b939b", "name": "Dell-R2", "type": "Router_SR", "allowed": true,
21 - "latitude": 80.80, "longitude": 90.10,
22 - "params": { "routerIp": "192.168.0.2/32",
23 - "routerMac": "00:01:e8:8b:93:9e",
24 - "nodeSid": 102,
25 - "isEdgeRouter" : true,
26 - "subnets": [
27 - { "portNo": 46, "subnetIp": "10.200.2.1/24" }
28 - ]
29 - }
30 - },
31 -
32 - { "nodeDpid": "of:00010001e88b938c", "name": "Dell-R3", "type": "Router_SR", "allowed": true,
33 - "latitude": 80.80, "longitude": 90.10,
34 - "params": { "routerIp": "192.168.0.3/32",
35 - "routerMac": "00:01:e8:8b:93:8f",
36 - "nodeSid": 103,
37 - "isEdgeRouter" : true,
38 - "subnets": [
39 - { "portNo": 46, "subnetIp": "10.200.3.1/24" }
40 - ]
41 - }
42 - },
43 -
44 - { "nodeDpid": "of:00010001e88b93ad", "name": "Dell-R4", "type": "Router_SR", "allowed": true,
45 - "latitude": 80.80, "longitude": 90.10,
46 - "params": { "routerIp": "192.168.0.4/32",
47 - "routerMac": "00:01:e8:8b:93:b0",
48 - "nodeSid": 104,
49 - "isEdgeRouter" : true,
50 - "subnets": [
51 - { "portNo": 46, "subnetIp": "10.200.4.1/24" }
52 - ]
53 - }
54 - },
55 -
56 - { "nodeDpid": "of:00010001e88b93bc", "name": "Dell-R5", "type": "Router_SR", "allowed": true,
57 - "latitude": 80.80, "longitude": 90.10,
58 - "params": { "routerIp": "192.168.0.5/32",
59 - "routerMac": "00:01:e8:8b:93:bf",
60 - "nodeSid": 105,
61 - "isEdgeRouter" : false
62 - }
63 - },
64 -
65 - { "nodeDpid": "of:00010001e88b93c2", "name": "Dell-R6", "type": "Router_SR", "allowed": true,
66 - "latitude": 80.80, "longitude": 90.10,
67 - "params": { "routerIp": "192.168.0.6/32",
68 - "routerMac": "00:01:e8:8b:93:c5",
69 - "nodeSid": 106,
70 - "isEdgeRouter" : false
71 - }
72 - },
73 -
74 - { "nodeDpid": "of:00010001e88b9398", "name": "Dell-R7", "type": "Router_SR", "allowed": true,
75 - "latitude": 80.80, "longitude": 90.10,
76 - "params": { "routerIp": "192.168.0.7/32",
77 - "routerMac": "00:01:e8:8b:93:9b",
78 - "nodeSid": 107,
79 - "isEdgeRouter": false
80 - }
81 - },
82 -
83 - { "nodeDpid": "of:00010001e88b27e3", "name": "Dell-R8", "type": "Router_SR", "allowed": true,
84 - "latitude": 80.80, "longitude": 90.10,
85 - "params": { "routerIp": "192.168.0.8/32",
86 - "routerMac": "00:01:e8:8b:27:e6",
87 - "nodeSid": 108,
88 - "isEdgeRouter": false
89 - }
90 - }
91 -
92 - ]
93 -}