홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
weibit
Committed by Gerrit Code Review
94f6c34e 1 parent 8ba3ac05

change the optical topology configuration for packet layer recovery 

Change-Id: I077ded9fe05854fb524e6cd25954923df0184061
Inline Side-by-side
Showing 3 changed files with 45 additions and 19 deletions
...@@ -144,6 +144,13 @@ ...@@ -144,6 +144,13 @@
144 { "src": "of:0000ffffffff0003/2", "dst": "of:0000ffffffffff06/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, 144 { "src": "of:0000ffffffff0003/2", "dst": "of:0000ffffffffff06/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
145 { "src": "of:0000ffffffff0004/2", "dst": "of:0000ffffffffff07/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, 145 { "src": "of:0000ffffffff0004/2", "dst": "of:0000ffffffffff07/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
146 { "src": "of:0000ffffffff0005/2", "dst": "of:0000ffffffffff09/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }, 146 { "src": "of:0000ffffffff0005/2", "dst": "of:0000ffffffffff09/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
147 - { "src": "of:0000ffffffff0006/2", "dst": "of:0000ffffffffff0A/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } } 147 + { "src": "of:0000ffffffff0006/2", "dst": "of:0000ffffffffff0A/10", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
148 +
149 + { "src": "of:0000ffffffff0001/3", "dst": "of:0000ffffffffff01/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
150 + { "src": "of:0000ffffffff0002/3", "dst": "of:0000ffffffffff04/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
151 + { "src": "of:0000ffffffff0003/3", "dst": "of:0000ffffffffff06/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
152 + { "src": "of:0000ffffffff0004/3", "dst": "of:0000ffffffffff07/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
153 + { "src": "of:0000ffffffff0005/3", "dst": "of:0000ffffffffff09/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } },
154 + { "src": "of:0000ffffffff0006/3", "dst": "of:0000ffffffffff0A/11", "type": "OPTICAL", "annotations": { "bandwidth": 100000, "optical.type": "cross-connect", "durable": "true" } }
148 ] 155 ]
149 } 156 }
......
...@@ -64,12 +64,19 @@ class OpticalTopo(Topo): ...@@ -64,12 +64,19 @@ class OpticalTopo(Topo):
64 self.addIntf(s5,'tap33') 64 self.addIntf(s5,'tap33')
65 self.addIntf(s6,'tap34') 65 self.addIntf(s6,'tap34')
66 66
67 + self.addIntf(s1,'tap35')
68 + self.addIntf(s2,'tap36')
69 + self.addIntf(s3,'tap37')
70 + self.addIntf(s4,'tap38')
71 + self.addIntf(s5,'tap39')
72 + self.addIntf(s6,'tap40')
73 +
67 # if you use, sudo mn --custom custom/optical.py, then register the topo: 74 # if you use, sudo mn --custom custom/optical.py, then register the topo:
68 topos = {'optical': ( lambda: OpticalTopo() )} 75 topos = {'optical': ( lambda: OpticalTopo() )}
69 76
70 77
71 def run(): 78 def run():
72 - c = RemoteController('c','127.0.0.1',6633) 79 + c = RemoteController('c','192.168.56.101',6633)
73 net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True) 80 net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True)
74 net.addController(c) 81 net.addController(c)
75 net.start() 82 net.start()
......
...@@ -35,7 +35,13 @@ ...@@ -35,7 +35,13 @@
35 {port,31,[{interface,"tap31"}]}, 35 {port,31,[{interface,"tap31"}]},
36 {port,32,[{interface,"tap32"}]}, 36 {port,32,[{interface,"tap32"}]},
37 {port,33,[{interface,"tap33"}]}, 37 {port,33,[{interface,"tap33"}]},
38 - {port,34,[{interface,"tap34"}]}]}, 38 + {port,34,[{interface,"tap34"}]},
39 + {port,35,[{interface,"tap35"}]},
40 + {port,36,[{interface,"tap36"}]},
41 + {port,37,[{interface,"tap37"}]},
42 + {port,38,[{interface,"tap38"}]},
43 + {port,39,[{interface,"tap39"}]},
44 + {port,40,[{interface,"tap40"}]}]},
39 {capable_switch_queues,[]}, 45 {capable_switch_queues,[]},
40 {optical_links, 46 {optical_links,
41 [{{1,50},{2,30}}, 47 [{{1,50},{2,30}},
...@@ -56,17 +62,18 @@ ...@@ -56,17 +62,18 @@
56 [{switch,1, 62 [{switch,1,
57 [{backend,linc_us4_oe}, 63 [{backend,linc_us4_oe},
58 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"}, 64 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
59 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 65 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
60 {controllers_listener,disabled}, 66 {controllers_listener,disabled},
61 {queues_status,disabled}, 67 {queues_status,disabled},
62 {ports, 68 {ports,
63 [{port,1,[{queues,[]},{port_no,50}]}, 69 [{port,1,[{queues,[]},{port_no,50}]},
64 {port,7,[{queues,[]},{port_no,20}]}, 70 {port,7,[{queues,[]},{port_no,20}]},
65 - {port,29,[{queues,[]},{port_no,10}]}]}]}, 71 + {port,29,[{queues,[]},{port_no,10}]},
72 + {port,35,[{queues,[]},{port_no,11}]}]}]},
66 {switch,2, 73 {switch,2,
67 [{backend,linc_us4_oe}, 74 [{backend,linc_us4_oe},
68 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"}, 75 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
69 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 76 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
70 {controllers_listener,disabled}, 77 {controllers_listener,disabled},
71 {queues_status,disabled}, 78 {queues_status,disabled},
72 {ports, 79 {ports,
...@@ -76,7 +83,7 @@ ...@@ -76,7 +83,7 @@
76 {switch,3, 83 {switch,3,
77 [{backend,linc_us4_oe}, 84 [{backend,linc_us4_oe},
78 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"}, 85 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
79 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 86 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
80 {controllers_listener,disabled}, 87 {controllers_listener,disabled},
81 {queues_status,disabled}, 88 {queues_status,disabled},
82 {ports, 89 {ports,
...@@ -86,17 +93,18 @@ ...@@ -86,17 +93,18 @@
86 {switch,4, 93 {switch,4,
87 [{backend,linc_us4_oe}, 94 [{backend,linc_us4_oe},
88 {datapath_id,"00:00:ff:ff:ff:ff:ff:04"}, 95 {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
89 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 96 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
90 {controllers_listener,disabled}, 97 {controllers_listener,disabled},
91 {queues_status,disabled}, 98 {queues_status,disabled},
92 {ports, 99 {ports,
93 [{port,6,[{queues,[]},{port_no,50}]}, 100 [{port,6,[{queues,[]},{port_no,50}]},
94 {port,13,[{queues,[]},{port_no,20}]}, 101 {port,13,[{queues,[]},{port_no,20}]},
95 - {port,30,[{queues,[]},{port_no,10}]}]}]}, 102 + {port,30,[{queues,[]},{port_no,10}]},
103 + {port,36,[{queues,[]},{port_no,11}]}]}]},
96 {switch,5, 104 {switch,5,
97 [{backend,linc_us4_oe}, 105 [{backend,linc_us4_oe},
98 {datapath_id,"00:00:ff:ff:ff:ff:ff:05"}, 106 {datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
99 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 107 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
100 {controllers_listener,disabled}, 108 {controllers_listener,disabled},
101 {queues_status,disabled}, 109 {queues_status,disabled},
102 {ports, 110 {ports,
...@@ -107,18 +115,19 @@ ...@@ -107,18 +115,19 @@
107 {switch,7, 115 {switch,7,
108 [{backend,linc_us4_oe}, 116 [{backend,linc_us4_oe},
109 {datapath_id,"00:00:ff:ff:ff:ff:ff:07"}, 117 {datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
110 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 118 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
111 {controllers_listener,disabled}, 119 {controllers_listener,disabled},
112 {queues_status,disabled}, 120 {queues_status,disabled},
113 {ports, 121 {ports,
114 [{port,18,[{queues,[]},{port_no,50}]}, 122 [{port,18,[{queues,[]},{port_no,50}]},
115 {port,21,[{queues,[]},{port_no,20}]}, 123 {port,21,[{queues,[]},{port_no,20}]},
116 {port,23,[{queues,[]},{port_no,30}]}, 124 {port,23,[{queues,[]},{port_no,30}]},
117 - {port,32,[{queues,[]},{port_no,10}]}]}]}, 125 + {port,32,[{queues,[]},{port_no,10}]},
126 + {port,38,[{queues,[]},{port_no,11}]}]}]},
118 {switch,8, 127 {switch,8,
119 [{backend,linc_us4_oe}, 128 [{backend,linc_us4_oe},
120 {datapath_id,"00:00:ff:ff:ff:ff:ff:08"}, 129 {datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
121 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 130 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
122 {controllers_listener,disabled}, 131 {controllers_listener,disabled},
123 {queues_status,disabled}, 132 {queues_status,disabled},
124 {ports, 133 {ports,
...@@ -128,27 +137,29 @@ ...@@ -128,27 +137,29 @@
128 {switch,9, 137 {switch,9,
129 [{backend,linc_us4_oe}, 138 [{backend,linc_us4_oe},
130 {datapath_id,"00:00:ff:ff:ff:ff:ff:09"}, 139 {datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
131 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 140 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
132 {controllers_listener,disabled}, 141 {controllers_listener,disabled},
133 {queues_status,disabled}, 142 {queues_status,disabled},
134 {ports, 143 {ports,
135 [{port,24,[{queues,[]},{port_no,50}]}, 144 [{port,24,[{queues,[]},{port_no,50}]},
136 {port,27,[{queues,[]},{port_no,20}]}, 145 {port,27,[{queues,[]},{port_no,20}]},
137 - {port,33,[{queues,[]},{port_no,10}]}]}]}, 146 + {port,33,[{queues,[]},{port_no,10}]},
147 + {port,39,[{queues,[]},{port_no,11}]}]}]},
138 {switch,10, 148 {switch,10,
139 [{backend,linc_us4_oe}, 149 [{backend,linc_us4_oe},
140 {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"}, 150 {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
141 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 151 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
142 {controllers_listener,disabled}, 152 {controllers_listener,disabled},
143 {queues_status,disabled}, 153 {queues_status,disabled},
144 {ports, 154 {ports,
145 [{port,26,[{queues,[]},{port_no,50}]}, 155 [{port,26,[{queues,[]},{port_no,50}]},
146 {port,28,[{queues,[]},{port_no,20}]}, 156 {port,28,[{queues,[]},{port_no,20}]},
147 - {port,34,[{queues,[]},{port_no,10}]}]}]}, 157 + {port,34,[{queues,[]},{port_no,10}]},
158 + {port,40,[{queues,[]},{port_no,11}]}]}]},
148 {switch,6, 159 {switch,6,
149 [{backend,linc_us4_oe}, 160 [{backend,linc_us4_oe},
150 {datapath_id,"00:00:ff:ff:ff:ff:ff:06"}, 161 {datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
151 - {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]}, 162 + {controllers,[{"Switch0-Controller","192.168.56.101",6633,tcp}]},
152 {controllers_listener,disabled}, 163 {controllers_listener,disabled},
153 {queues_status,disabled}, 164 {queues_status,disabled},
154 {ports, 165 {ports,
...@@ -156,7 +167,8 @@ ...@@ -156,7 +167,8 @@
156 {port,14,[{queues,[]},{port_no,20}]}, 167 {port,14,[{queues,[]},{port_no,20}]},
157 {port,16,[{queues,[]},{port_no,40}]}, 168 {port,16,[{queues,[]},{port_no,40}]},
158 {port,19,[{queues,[]},{port_no,30}]}, 169 {port,19,[{queues,[]},{port_no,30}]},
159 - {port,31,[{queues,[]},{port_no,10}]}]}]}]}]}, 170 + {port,31,[{queues,[]},{port_no,10}]},
171 + {port,37,[{queues,[]},{port_no,11}]}]}]}]}]},
160 {epcap,[{verbose,false},{stats_interval,10}]}, 172 {epcap,[{verbose,false},{stats_interval,10}]},
161 {enetconf, 173 {enetconf,
162 [{capabilities, 174 [{capabilities,
......