홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
weibit
3cd7b655 2 parents bf6a401a 195cb389

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Expand all
Inline Side-by-side
Showing 29 changed files with 1121 additions and 215 deletions
...@@ -53,11 +53,13 @@ public class HostToInterfaceAdaptor implements InterfaceService { ...@@ -53,11 +53,13 @@ public class HostToInterfaceAdaptor implements InterfaceService {
53 public Interface getInterface(ConnectPoint connectPoint) { 53 public Interface getInterface(ConnectPoint connectPoint) {
54 checkNotNull(connectPoint); 54 checkNotNull(connectPoint);
55 55
56 - PortAddresses portAddresses = 56 + Set<PortAddresses> portAddresses =
57 hostService.getAddressBindingsForPort(connectPoint); 57 hostService.getAddressBindingsForPort(connectPoint);
58 58
59 - if (!portAddresses.ipAddresses().isEmpty()) { 59 + for (PortAddresses addresses : portAddresses) {
60 - return new Interface(portAddresses); 60 + if (addresses.connectPoint().equals(connectPoint)) {
61 + return new Interface(addresses);
62 + }
61 } 63 }
62 64
63 return null; 65 return null;
......
...@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals; ...@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
23 import static org.junit.Assert.assertNull; 23 import static org.junit.Assert.assertNull;
24 import static org.junit.Assert.assertTrue; 24 import static org.junit.Assert.assertTrue;
25 25
26 +import java.util.Collections;
26 import java.util.Map; 27 import java.util.Map;
27 import java.util.Set; 28 import java.util.Set;
28 29
...@@ -63,10 +64,6 @@ public class HostToInterfaceAdaptorTest { ...@@ -63,10 +64,6 @@ public class HostToInterfaceAdaptorTest {
63 private static final ConnectPoint NON_EXISTENT_CP = new ConnectPoint( 64 private static final ConnectPoint NON_EXISTENT_CP = new ConnectPoint(
64 DeviceId.deviceId("doesnotexist"), PortNumber.portNumber(1)); 65 DeviceId.deviceId("doesnotexist"), PortNumber.portNumber(1));
65 66
66 - private static final PortAddresses DEFAULT_PA = new PortAddresses(
67 - NON_EXISTENT_CP, null, null);
68 -
69 -
70 @Before 67 @Before
71 public void setUp() throws Exception { 68 public void setUp() throws Exception {
72 hostService = createMock(HostService.class); 69 hostService = createMock(HostService.class);
...@@ -123,7 +120,8 @@ public class HostToInterfaceAdaptorTest { ...@@ -123,7 +120,8 @@ public class HostToInterfaceAdaptorTest {
123 MacAddress mac) { 120 MacAddress mac) {
124 PortAddresses pa = new PortAddresses(cp, ipAddresses, mac); 121 PortAddresses pa = new PortAddresses(cp, ipAddresses, mac);
125 portAddresses.add(pa); 122 portAddresses.add(pa);
126 - expect(hostService.getAddressBindingsForPort(cp)).andReturn(pa).anyTimes(); 123 + expect(hostService.getAddressBindingsForPort(cp)).andReturn(
124 + Collections.singleton(pa)).anyTimes();
127 125
128 Interface intf = new Interface(cp, ipAddresses, mac); 126 Interface intf = new Interface(cp, ipAddresses, mac);
129 interfaces.put(cp, intf); 127 interfaces.put(cp, intf);
...@@ -158,7 +156,7 @@ public class HostToInterfaceAdaptorTest { ...@@ -158,7 +156,7 @@ public class HostToInterfaceAdaptorTest {
158 // Try and get an interface for a connect point with no addresses 156 // Try and get an interface for a connect point with no addresses
159 reset(hostService); 157 reset(hostService);
160 expect(hostService.getAddressBindingsForPort(NON_EXISTENT_CP)) 158 expect(hostService.getAddressBindingsForPort(NON_EXISTENT_CP))
161 - .andReturn(DEFAULT_PA).anyTimes(); 159 + .andReturn(Collections.<PortAddresses>emptySet()).anyTimes();
162 replay(hostService); 160 replay(hostService);
163 161
164 assertNull(adaptor.getInterface(NON_EXISTENT_CP)); 162 assertNull(adaptor.getInterface(NON_EXISTENT_CP));
......
...@@ -34,11 +34,7 @@ public interface HostAdminService { ...@@ -34,11 +34,7 @@ public interface HostAdminService {
34 * Binds IP and MAC addresses to the given connection point. 34 * Binds IP and MAC addresses to the given connection point.
35 * <p> 35 * <p>
36 * The addresses are added to the set of addresses already bound to the 36 * The addresses are added to the set of addresses already bound to the
37 - * connection point. If any of the fields in addresses is null, no change 37 + * connection point.
38 - * is made to the corresponding addresses in the store.
39 - * {@link #unbindAddressesFromPort(PortAddresses)} must be use to unbind
40 - * addresses that have previously been bound.
41 - * </p>
42 * 38 *
43 * @param addresses address object containing addresses to add and the port 39 * @param addresses address object containing addresses to add and the port
44 * to add them to 40 * to add them to
......
...@@ -135,7 +135,7 @@ public interface HostService { ...@@ -135,7 +135,7 @@ public interface HostService {
135 * @param connectPoint the connection point to retrieve address bindings for 135 * @param connectPoint the connection point to retrieve address bindings for
136 * @return addresses bound to the port 136 * @return addresses bound to the port
137 */ 137 */
138 - PortAddresses getAddressBindingsForPort(ConnectPoint connectPoint); 138 + Set<PortAddresses> getAddressBindingsForPort(ConnectPoint connectPoint);
139 139
140 /** 140 /**
141 * Adds the specified host listener. 141 * Adds the specified host listener.
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
15 */ 15 */
16 package org.onlab.onos.net.host; 16 package org.onlab.onos.net.host;
17 17
18 +import java.util.Set;
19 +
18 import org.onlab.onos.net.ConnectPoint; 20 import org.onlab.onos.net.ConnectPoint;
19 import org.onlab.onos.net.DeviceId; 21 import org.onlab.onos.net.DeviceId;
20 import org.onlab.onos.net.Host; 22 import org.onlab.onos.net.Host;
...@@ -25,8 +27,6 @@ import org.onlab.packet.IpAddress; ...@@ -25,8 +27,6 @@ import org.onlab.packet.IpAddress;
25 import org.onlab.packet.MacAddress; 27 import org.onlab.packet.MacAddress;
26 import org.onlab.packet.VlanId; 28 import org.onlab.packet.VlanId;
27 29
28 -import java.util.Set;
29 -
30 /** 30 /**
31 * Manages inventory of end-station hosts; not intended for direct use. 31 * Manages inventory of end-station hosts; not intended for direct use.
32 */ 32 */
...@@ -153,5 +153,5 @@ public interface HostStore extends Store<HostEvent, HostStoreDelegate> { ...@@ -153,5 +153,5 @@ public interface HostStore extends Store<HostEvent, HostStoreDelegate> {
153 * for 153 * for
154 * @return address information for the connection point 154 * @return address information for the connection point
155 */ 155 */
156 - PortAddresses getAddressBindingsForPort(ConnectPoint connectPoint); 156 + Set<PortAddresses> getAddressBindingsForPort(ConnectPoint connectPoint);
157 } 157 }
......
...@@ -95,7 +95,7 @@ public class HostServiceAdapter implements HostService { ...@@ -95,7 +95,7 @@ public class HostServiceAdapter implements HostService {
95 } 95 }
96 96
97 @Override 97 @Override
98 - public PortAddresses getAddressBindingsForPort(ConnectPoint connectPoint) { 98 + public Set<PortAddresses> getAddressBindingsForPort(ConnectPoint connectPoint) {
99 return null; 99 return null;
100 } 100 }
101 101
......
...@@ -207,7 +207,7 @@ public class HostManager ...@@ -207,7 +207,7 @@ public class HostManager
207 } 207 }
208 208
209 @Override 209 @Override
210 - public PortAddresses getAddressBindingsForPort(ConnectPoint connectPoint) { 210 + public Set<PortAddresses> getAddressBindingsForPort(ConnectPoint connectPoint) {
211 return store.getAddressBindingsForPort(connectPoint); 211 return store.getAddressBindingsForPort(connectPoint);
212 } 212 }
213 213
......
...@@ -175,9 +175,10 @@ public class HostMonitor implements TimerTask { ...@@ -175,9 +175,10 @@ public class HostMonitor implements TimerTask {
175 for (Device device : deviceService.getDevices()) { 175 for (Device device : deviceService.getDevices()) {
176 for (Port port : deviceService.getPorts(device.id())) { 176 for (Port port : deviceService.getPorts(device.id())) {
177 ConnectPoint cp = new ConnectPoint(device.id(), port.number()); 177 ConnectPoint cp = new ConnectPoint(device.id(), port.number());
178 - PortAddresses portAddresses = 178 + Set<PortAddresses> portAddressSet =
179 hostManager.getAddressBindingsForPort(cp); 179 hostManager.getAddressBindingsForPort(cp);
180 180
181 + for (PortAddresses portAddresses : portAddressSet) {
181 for (InterfaceIpAddress ia : portAddresses.ipAddresses()) { 182 for (InterfaceIpAddress ia : portAddresses.ipAddresses()) {
182 if (ia.subnetAddress().contains(targetIp)) { 183 if (ia.subnetAddress().contains(targetIp)) {
183 sendProbe(device.id(), port, targetIp, 184 sendProbe(device.id(), port, targetIp,
...@@ -187,6 +188,7 @@ public class HostMonitor implements TimerTask { ...@@ -187,6 +188,7 @@ public class HostMonitor implements TimerTask {
187 } 188 }
188 } 189 }
189 } 190 }
191 + }
190 192
191 private void sendProbe(DeviceId deviceId, Port port, IpAddress targetIp, 193 private void sendProbe(DeviceId deviceId, Port port, IpAddress targetIp,
192 IpAddress sourceIp, MacAddress sourceMac) { 194 IpAddress sourceIp, MacAddress sourceMac) {
......
...@@ -134,9 +134,10 @@ public class ProxyArpManager implements ProxyArpService { ...@@ -134,9 +134,10 @@ public class ProxyArpManager implements ProxyArpService {
134 IpAddress target = 134 IpAddress target =
135 IpAddress.valueOf(IpAddress.Version.INET, 135 IpAddress.valueOf(IpAddress.Version.INET,
136 arp.getTargetProtocolAddress()); 136 arp.getTargetProtocolAddress());
137 - PortAddresses addresses = 137 + Set<PortAddresses> addressSet =
138 hostService.getAddressBindingsForPort(inPort); 138 hostService.getAddressBindingsForPort(inPort);
139 139
140 + for (PortAddresses addresses : addressSet) {
140 for (InterfaceIpAddress ia : addresses.ipAddresses()) { 141 for (InterfaceIpAddress ia : addresses.ipAddresses()) {
141 if (ia.ipAddress().equals(target)) { 142 if (ia.ipAddress().equals(target)) {
142 Ethernet arpReply = 143 Ethernet arpReply =
...@@ -144,6 +145,7 @@ public class ProxyArpManager implements ProxyArpService { ...@@ -144,6 +145,7 @@ public class ProxyArpManager implements ProxyArpService {
144 sendTo(arpReply, inPort); 145 sendTo(arpReply, inPort);
145 } 146 }
146 } 147 }
148 + }
147 return; 149 return;
148 } else { 150 } else {
149 // If the source address matches one of our external addresses 151 // If the source address matches one of our external addresses
...@@ -244,7 +246,7 @@ public class ProxyArpManager implements ProxyArpService { ...@@ -244,7 +246,7 @@ public class ProxyArpManager implements ProxyArpService {
244 // TODO: Is this sufficient to identify outside-facing ports: just 246 // TODO: Is this sufficient to identify outside-facing ports: just
245 // having IP addresses on a port? 247 // having IP addresses on a port?
246 // 248 //
247 - return !hostService.getAddressBindingsForPort(port).ipAddresses().isEmpty(); 249 + return !hostService.getAddressBindingsForPort(port).isEmpty();
248 } 250 }
249 251
250 @Override 252 @Override
......
...@@ -234,10 +234,10 @@ public class HostManagerTest { ...@@ -234,10 +234,10 @@ public class HostManagerTest {
234 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1); 234 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1);
235 235
236 mgr.bindAddressesToPort(add1); 236 mgr.bindAddressesToPort(add1);
237 - PortAddresses storedAddresses = mgr.getAddressBindingsForPort(CP1); 237 + Set<PortAddresses> storedAddresses = mgr.getAddressBindingsForPort(CP1);
238 238
239 - assertTrue(add1.ipAddresses().equals(storedAddresses.ipAddresses())); 239 + assertEquals(1, storedAddresses.size());
240 - assertTrue(add1.mac().equals(storedAddresses.mac())); 240 + assertTrue(storedAddresses.contains(add1));
241 241
242 // Add some more addresses and check that they're added correctly 242 // Add some more addresses and check that they're added correctly
243 PortAddresses add2 = 243 PortAddresses add2 =
...@@ -246,18 +246,19 @@ public class HostManagerTest { ...@@ -246,18 +246,19 @@ public class HostManagerTest {
246 mgr.bindAddressesToPort(add2); 246 mgr.bindAddressesToPort(add2);
247 storedAddresses = mgr.getAddressBindingsForPort(CP1); 247 storedAddresses = mgr.getAddressBindingsForPort(CP1);
248 248
249 - assertTrue(storedAddresses.ipAddresses().equals( 249 + assertEquals(2, storedAddresses.size());
250 - Sets.newHashSet(IA1, IA2, IA3))); 250 + assertTrue(storedAddresses.contains(add1));
251 - assertTrue(storedAddresses.mac().equals(MAC1)); 251 + assertTrue(storedAddresses.contains(add2));
252 252
253 PortAddresses add3 = new PortAddresses(CP1, null, MAC2); 253 PortAddresses add3 = new PortAddresses(CP1, null, MAC2);
254 254
255 mgr.bindAddressesToPort(add3); 255 mgr.bindAddressesToPort(add3);
256 storedAddresses = mgr.getAddressBindingsForPort(CP1); 256 storedAddresses = mgr.getAddressBindingsForPort(CP1);
257 257
258 - assertTrue(storedAddresses.ipAddresses().equals( 258 + assertEquals(3, storedAddresses.size());
259 - Sets.newHashSet(IA1, IA2, IA3))); 259 + assertTrue(storedAddresses.contains(add1));
260 - assertTrue(storedAddresses.mac().equals(MAC2)); 260 + assertTrue(storedAddresses.contains(add2));
261 + assertTrue(storedAddresses.contains(add3));
261 } 262 }
262 263
263 @Test 264 @Test
...@@ -266,10 +267,10 @@ public class HostManagerTest { ...@@ -266,10 +267,10 @@ public class HostManagerTest {
266 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1); 267 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1);
267 268
268 mgr.bindAddressesToPort(add1); 269 mgr.bindAddressesToPort(add1);
269 - PortAddresses storedAddresses = mgr.getAddressBindingsForPort(CP1); 270 + Set<PortAddresses> storedAddresses = mgr.getAddressBindingsForPort(CP1);
270 271
271 - assertTrue(storedAddresses.ipAddresses().size() == 2); 272 + assertEquals(1, storedAddresses.size());
272 - assertNotNull(storedAddresses.mac()); 273 + assertTrue(storedAddresses.contains(add1));
273 274
274 PortAddresses rem1 = 275 PortAddresses rem1 =
275 new PortAddresses(CP1, Sets.newHashSet(IA1), null); 276 new PortAddresses(CP1, Sets.newHashSet(IA1), null);
...@@ -277,25 +278,15 @@ public class HostManagerTest { ...@@ -277,25 +278,15 @@ public class HostManagerTest {
277 mgr.unbindAddressesFromPort(rem1); 278 mgr.unbindAddressesFromPort(rem1);
278 storedAddresses = mgr.getAddressBindingsForPort(CP1); 279 storedAddresses = mgr.getAddressBindingsForPort(CP1);
279 280
280 - assertTrue(storedAddresses.ipAddresses().equals(Sets.newHashSet(IA2))); 281 + // It shouldn't have been removed because it didn't match the originally
281 - assertTrue(storedAddresses.mac().equals(MAC1)); 282 + // submitted address object
283 + assertEquals(1, storedAddresses.size());
284 + assertTrue(storedAddresses.contains(add1));
282 285
283 - PortAddresses rem2 = new PortAddresses(CP1, null, MAC1); 286 + mgr.unbindAddressesFromPort(add1);
284 -
285 - mgr.unbindAddressesFromPort(rem2);
286 storedAddresses = mgr.getAddressBindingsForPort(CP1); 287 storedAddresses = mgr.getAddressBindingsForPort(CP1);
287 288
288 - assertTrue(storedAddresses.ipAddresses().equals(Sets.newHashSet(IA2))); 289 + assertTrue(storedAddresses.isEmpty());
289 - assertNull(storedAddresses.mac());
290 -
291 - PortAddresses rem3 =
292 - new PortAddresses(CP1, Sets.newHashSet(IA2), MAC1);
293 -
294 - mgr.unbindAddressesFromPort(rem3);
295 - storedAddresses = mgr.getAddressBindingsForPort(CP1);
296 -
297 - assertTrue(storedAddresses.ipAddresses().isEmpty());
298 - assertNull(storedAddresses.mac());
299 } 290 }
300 291
301 @Test 292 @Test
...@@ -304,16 +295,15 @@ public class HostManagerTest { ...@@ -304,16 +295,15 @@ public class HostManagerTest {
304 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1); 295 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1);
305 296
306 mgr.bindAddressesToPort(add1); 297 mgr.bindAddressesToPort(add1);
307 - PortAddresses storedAddresses = mgr.getAddressBindingsForPort(CP1); 298 + Set<PortAddresses> storedAddresses = mgr.getAddressBindingsForPort(CP1);
308 299
309 - assertTrue(storedAddresses.ipAddresses().size() == 2); 300 + assertEquals(1, storedAddresses.size());
310 - assertNotNull(storedAddresses.mac()); 301 + assertTrue(storedAddresses.contains(add1));
311 302
312 mgr.clearAddresses(CP1); 303 mgr.clearAddresses(CP1);
313 storedAddresses = mgr.getAddressBindingsForPort(CP1); 304 storedAddresses = mgr.getAddressBindingsForPort(CP1);
314 305
315 - assertTrue(storedAddresses.ipAddresses().isEmpty()); 306 + assertTrue(storedAddresses.isEmpty());
316 - assertNull(storedAddresses.mac());
317 } 307 }
318 308
319 @Test 309 @Test
...@@ -322,12 +312,10 @@ public class HostManagerTest { ...@@ -322,12 +312,10 @@ public class HostManagerTest {
322 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1); 312 new PortAddresses(CP1, Sets.newHashSet(IA1, IA2), MAC1);
323 313
324 mgr.bindAddressesToPort(add1); 314 mgr.bindAddressesToPort(add1);
325 - PortAddresses storedAddresses = mgr.getAddressBindingsForPort(CP1); 315 + Set<PortAddresses> storedAddresses = mgr.getAddressBindingsForPort(CP1);
326 316
327 - assertTrue(storedAddresses.connectPoint().equals(CP1)); 317 + assertEquals(1, storedAddresses.size());
328 - assertTrue(storedAddresses.ipAddresses().equals( 318 + assertTrue(storedAddresses.contains(add1));
329 - Sets.newHashSet(IA1, IA2)));
330 - assertTrue(storedAddresses.mac().equals(MAC1));
331 } 319 }
332 320
333 @Test 321 @Test
......
...@@ -20,7 +20,9 @@ import static org.easymock.EasyMock.expect; ...@@ -20,7 +20,9 @@ import static org.easymock.EasyMock.expect;
20 import static org.easymock.EasyMock.expectLastCall; 20 import static org.easymock.EasyMock.expectLastCall;
21 import static org.easymock.EasyMock.replay; 21 import static org.easymock.EasyMock.replay;
22 import static org.easymock.EasyMock.verify; 22 import static org.easymock.EasyMock.verify;
23 -import static org.junit.Assert.*; 23 +import static org.junit.Assert.assertArrayEquals;
24 +import static org.junit.Assert.assertEquals;
25 +import static org.junit.Assert.assertTrue;
24 26
25 import java.util.ArrayList; 27 import java.util.ArrayList;
26 import java.util.Collections; 28 import java.util.Collections;
...@@ -130,7 +132,7 @@ public class HostMonitorTest { ...@@ -130,7 +132,7 @@ public class HostMonitorTest {
130 expect(hostManager.getHostsByIp(TARGET_IP_ADDR)) 132 expect(hostManager.getHostsByIp(TARGET_IP_ADDR))
131 .andReturn(Collections.<Host>emptySet()).anyTimes(); 133 .andReturn(Collections.<Host>emptySet()).anyTimes();
132 expect(hostManager.getAddressBindingsForPort(cp)) 134 expect(hostManager.getAddressBindingsForPort(cp))
133 - .andReturn(pa).anyTimes(); 135 + .andReturn(Collections.singleton(pa)).anyTimes();
134 replay(hostManager); 136 replay(hostManager);
135 137
136 TestPacketService packetService = new TestPacketService(); 138 TestPacketService packetService = new TestPacketService();
......
...@@ -19,7 +19,10 @@ import static org.easymock.EasyMock.anyObject; ...@@ -19,7 +19,10 @@ import static org.easymock.EasyMock.anyObject;
19 import static org.easymock.EasyMock.createMock; 19 import static org.easymock.EasyMock.createMock;
20 import static org.easymock.EasyMock.expect; 20 import static org.easymock.EasyMock.expect;
21 import static org.easymock.EasyMock.replay; 21 import static org.easymock.EasyMock.replay;
22 -import static org.junit.Assert.*; 22 +import static org.junit.Assert.assertArrayEquals;
23 +import static org.junit.Assert.assertEquals;
24 +import static org.junit.Assert.assertFalse;
25 +import static org.junit.Assert.assertTrue;
23 26
24 import java.util.ArrayList; 27 import java.util.ArrayList;
25 import java.util.Collections; 28 import java.util.Collections;
...@@ -207,13 +210,18 @@ public class ProxyArpManagerTest { ...@@ -207,13 +210,18 @@ public class ProxyArpManagerTest {
207 IpAddress addr2 = IpAddress.valueOf("10.0." + (2 * i) + ".1"); 210 IpAddress addr2 = IpAddress.valueOf("10.0." + (2 * i) + ".1");
208 InterfaceIpAddress ia1 = new InterfaceIpAddress(addr1, prefix1); 211 InterfaceIpAddress ia1 = new InterfaceIpAddress(addr1, prefix1);
209 InterfaceIpAddress ia2 = new InterfaceIpAddress(addr2, prefix2); 212 InterfaceIpAddress ia2 = new InterfaceIpAddress(addr2, prefix2);
210 - PortAddresses pa = 213 + PortAddresses pa1 =
211 - new PortAddresses(cp, Sets.newHashSet(ia1, ia2), 214 + new PortAddresses(cp, Sets.newHashSet(ia1),
212 - MacAddress.valueOf(i)); 215 + MacAddress.valueOf(2 * i - 1));
213 - addresses.add(pa); 216 + PortAddresses pa2 =
217 + new PortAddresses(cp, Sets.newHashSet(ia2),
218 + MacAddress.valueOf(2 * i));
219 +
220 + addresses.add(pa1);
221 + addresses.add(pa2);
214 222
215 expect(hostService.getAddressBindingsForPort(cp)) 223 expect(hostService.getAddressBindingsForPort(cp))
216 - .andReturn(pa).anyTimes(); 224 + .andReturn(Sets.newHashSet(pa1, pa2)).anyTimes();
217 } 225 }
218 226
219 expect(hostService.getAddressBindings()).andReturn(addresses).anyTimes(); 227 expect(hostService.getAddressBindings()).andReturn(addresses).anyTimes();
...@@ -222,7 +230,7 @@ public class ProxyArpManagerTest { ...@@ -222,7 +230,7 @@ public class ProxyArpManagerTest {
222 ConnectPoint cp = new ConnectPoint(getDeviceId(i + NUM_ADDRESS_PORTS), 230 ConnectPoint cp = new ConnectPoint(getDeviceId(i + NUM_ADDRESS_PORTS),
223 P1); 231 P1);
224 expect(hostService.getAddressBindingsForPort(cp)) 232 expect(hostService.getAddressBindingsForPort(cp))
225 - .andReturn(new PortAddresses(cp, null, null)).anyTimes(); 233 + .andReturn(Collections.<PortAddresses>emptySet()).anyTimes();
226 } 234 }
227 } 235 }
228 236
...@@ -339,7 +347,8 @@ public class ProxyArpManagerTest { ...@@ -339,7 +347,8 @@ public class ProxyArpManagerTest {
339 IpAddress theirIp = IpAddress.valueOf("10.0.1.254"); 347 IpAddress theirIp = IpAddress.valueOf("10.0.1.254");
340 IpAddress ourFirstIp = IpAddress.valueOf("10.0.1.1"); 348 IpAddress ourFirstIp = IpAddress.valueOf("10.0.1.1");
341 IpAddress ourSecondIp = IpAddress.valueOf("10.0.2.1"); 349 IpAddress ourSecondIp = IpAddress.valueOf("10.0.2.1");
342 - MacAddress ourMac = MacAddress.valueOf(1L); 350 + MacAddress firstMac = MacAddress.valueOf(1L);
351 + MacAddress secondMac = MacAddress.valueOf(2L);
343 352
344 Host requestor = new DefaultHost(PID, HID2, MAC2, VLAN1, LOC1, 353 Host requestor = new DefaultHost(PID, HID2, MAC2, VLAN1, LOC1,
345 Collections.singleton(theirIp)); 354 Collections.singleton(theirIp));
...@@ -352,7 +361,7 @@ public class ProxyArpManagerTest { ...@@ -352,7 +361,7 @@ public class ProxyArpManagerTest {
352 proxyArp.reply(arpRequest, LOC1); 361 proxyArp.reply(arpRequest, LOC1);
353 362
354 assertEquals(1, packetService.packets.size()); 363 assertEquals(1, packetService.packets.size());
355 - Ethernet arpReply = buildArp(ARP.OP_REPLY, ourMac, MAC2, ourFirstIp, theirIp); 364 + Ethernet arpReply = buildArp(ARP.OP_REPLY, firstMac, MAC2, ourFirstIp, theirIp);
356 verifyPacketOut(arpReply, LOC1, packetService.packets.get(0)); 365 verifyPacketOut(arpReply, LOC1, packetService.packets.get(0));
357 366
358 // Test a request for the second address on that port 367 // Test a request for the second address on that port
...@@ -362,7 +371,7 @@ public class ProxyArpManagerTest { ...@@ -362,7 +371,7 @@ public class ProxyArpManagerTest {
362 proxyArp.reply(arpRequest, LOC1); 371 proxyArp.reply(arpRequest, LOC1);
363 372
364 assertEquals(1, packetService.packets.size()); 373 assertEquals(1, packetService.packets.size());
365 - arpReply = buildArp(ARP.OP_REPLY, ourMac, MAC2, ourSecondIp, theirIp); 374 + arpReply = buildArp(ARP.OP_REPLY, secondMac, MAC2, ourSecondIp, theirIp);
366 verifyPacketOut(arpReply, LOC1, packetService.packets.get(0)); 375 verifyPacketOut(arpReply, LOC1, packetService.packets.get(0));
367 } 376 }
368 377
......
...@@ -15,12 +15,25 @@ ...@@ -15,12 +15,25 @@
15 */ 15 */
16 package org.onlab.onos.store.host.impl; 16 package org.onlab.onos.store.host.impl;
17 17
18 -import com.google.common.collect.FluentIterable; 18 +import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
19 -import com.google.common.collect.HashMultimap; 19 +import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
20 -import com.google.common.collect.ImmutableList; 20 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
21 -import com.google.common.collect.ImmutableSet; 21 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED;
22 -import com.google.common.collect.Multimap; 22 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_REMOVED;
23 -import com.google.common.collect.Sets; 23 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_UPDATED;
24 +import static org.onlab.util.Tools.namedThreads;
25 +import static org.slf4j.LoggerFactory.getLogger;
26 +
27 +import java.io.IOException;
28 +import java.util.Collections;
29 +import java.util.HashMap;
30 +import java.util.HashSet;
31 +import java.util.Map;
32 +import java.util.Map.Entry;
33 +import java.util.Set;
34 +import java.util.concurrent.ConcurrentHashMap;
35 +import java.util.concurrent.ScheduledExecutorService;
36 +import java.util.concurrent.TimeUnit;
24 37
25 import org.apache.commons.lang3.RandomUtils; 38 import org.apache.commons.lang3.RandomUtils;
26 import org.apache.felix.scr.annotations.Activate; 39 import org.apache.felix.scr.annotations.Activate;
...@@ -45,7 +58,6 @@ import org.onlab.onos.net.host.HostDescription; ...@@ -45,7 +58,6 @@ import org.onlab.onos.net.host.HostDescription;
45 import org.onlab.onos.net.host.HostEvent; 58 import org.onlab.onos.net.host.HostEvent;
46 import org.onlab.onos.net.host.HostStore; 59 import org.onlab.onos.net.host.HostStore;
47 import org.onlab.onos.net.host.HostStoreDelegate; 60 import org.onlab.onos.net.host.HostStoreDelegate;
48 -import org.onlab.onos.net.host.InterfaceIpAddress;
49 import org.onlab.onos.net.host.PortAddresses; 61 import org.onlab.onos.net.host.PortAddresses;
50 import org.onlab.onos.net.provider.ProviderId; 62 import org.onlab.onos.net.provider.ProviderId;
51 import org.onlab.onos.store.AbstractStore; 63 import org.onlab.onos.store.AbstractStore;
...@@ -63,21 +75,13 @@ import org.onlab.packet.VlanId; ...@@ -63,21 +75,13 @@ import org.onlab.packet.VlanId;
63 import org.onlab.util.KryoNamespace; 75 import org.onlab.util.KryoNamespace;
64 import org.slf4j.Logger; 76 import org.slf4j.Logger;
65 77
66 -import java.io.IOException; 78 +import com.google.common.collect.FluentIterable;
67 -import java.util.HashMap; 79 +import com.google.common.collect.HashMultimap;
68 -import java.util.HashSet; 80 +import com.google.common.collect.ImmutableList;
69 -import java.util.Map; 81 +import com.google.common.collect.ImmutableSet;
70 -import java.util.Set; 82 +import com.google.common.collect.Multimap;
71 -import java.util.Map.Entry; 83 +import com.google.common.collect.Multimaps;
72 -import java.util.concurrent.ConcurrentHashMap; 84 +import com.google.common.collect.SetMultimap;
73 -import java.util.concurrent.ScheduledExecutorService;
74 -import java.util.concurrent.TimeUnit;
75 -
76 -import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
77 -import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
78 -import static org.onlab.onos.net.host.HostEvent.Type.*;
79 -import static org.onlab.util.Tools.namedThreads;
80 -import static org.slf4j.LoggerFactory.getLogger;
81 85
82 //TODO: multi-provider, annotation not supported. 86 //TODO: multi-provider, annotation not supported.
83 /** 87 /**
...@@ -100,8 +104,9 @@ public class GossipHostStore ...@@ -100,8 +104,9 @@ public class GossipHostStore
100 // Hosts tracked by their location 104 // Hosts tracked by their location
101 private final Multimap<ConnectPoint, Host> locations = HashMultimap.create(); 105 private final Multimap<ConnectPoint, Host> locations = HashMultimap.create();
102 106
103 - private final Map<ConnectPoint, PortAddresses> portAddresses = 107 + private final SetMultimap<ConnectPoint, PortAddresses> portAddresses =
104 - new ConcurrentHashMap<>(); 108 + Multimaps.synchronizedSetMultimap(
109 + HashMultimap.<ConnectPoint, PortAddresses>create());
105 110
106 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 111 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
107 protected HostClockService hostClockService; 112 protected HostClockService hostClockService;
...@@ -343,77 +348,37 @@ public class GossipHostStore ...@@ -343,77 +348,37 @@ public class GossipHostStore
343 348
344 @Override 349 @Override
345 public void updateAddressBindings(PortAddresses addresses) { 350 public void updateAddressBindings(PortAddresses addresses) {
346 - synchronized (portAddresses) {
347 - PortAddresses existing = portAddresses.get(addresses.connectPoint());
348 - if (existing == null) {
349 portAddresses.put(addresses.connectPoint(), addresses); 351 portAddresses.put(addresses.connectPoint(), addresses);
350 - } else {
351 - Set<InterfaceIpAddress> union =
352 - Sets.union(existing.ipAddresses(),
353 - addresses.ipAddresses()).immutableCopy();
354 -
355 - MacAddress newMac = (addresses.mac() == null) ? existing.mac()
356 - : addresses.mac();
357 -
358 - PortAddresses newAddresses =
359 - new PortAddresses(addresses.connectPoint(), union, newMac);
360 -
361 - portAddresses.put(newAddresses.connectPoint(), newAddresses);
362 - }
363 - }
364 } 352 }
365 353
366 @Override 354 @Override
367 public void removeAddressBindings(PortAddresses addresses) { 355 public void removeAddressBindings(PortAddresses addresses) {
368 - synchronized (portAddresses) { 356 + portAddresses.remove(addresses.connectPoint(), addresses);
369 - PortAddresses existing = portAddresses.get(addresses.connectPoint());
370 - if (existing != null) {
371 - Set<InterfaceIpAddress> difference =
372 - Sets.difference(existing.ipAddresses(),
373 - addresses.ipAddresses()).immutableCopy();
374 -
375 - // If they removed the existing mac, set the new mac to null.
376 - // Otherwise, keep the existing mac.
377 - MacAddress newMac = existing.mac();
378 - if (addresses.mac() != null && addresses.mac().equals(existing.mac())) {
379 - newMac = null;
380 - }
381 -
382 - PortAddresses newAddresses =
383 - new PortAddresses(addresses.connectPoint(), difference, newMac);
384 -
385 - portAddresses.put(newAddresses.connectPoint(), newAddresses);
386 - }
387 - }
388 } 357 }
389 358
390 @Override 359 @Override
391 public void clearAddressBindings(ConnectPoint connectPoint) { 360 public void clearAddressBindings(ConnectPoint connectPoint) {
392 - synchronized (portAddresses) { 361 + portAddresses.removeAll(connectPoint);
393 - portAddresses.remove(connectPoint);
394 - }
395 } 362 }
396 363
397 @Override 364 @Override
398 public Set<PortAddresses> getAddressBindings() { 365 public Set<PortAddresses> getAddressBindings() {
399 synchronized (portAddresses) { 366 synchronized (portAddresses) {
400 - return new HashSet<>(portAddresses.values()); 367 + return ImmutableSet.copyOf(portAddresses.values());
401 } 368 }
402 } 369 }
403 370
404 @Override 371 @Override
405 - public PortAddresses getAddressBindingsForPort(ConnectPoint connectPoint) { 372 + public Set<PortAddresses> getAddressBindingsForPort(ConnectPoint connectPoint) {
406 - PortAddresses addresses;
407 -
408 synchronized (portAddresses) { 373 synchronized (portAddresses) {
409 - addresses = portAddresses.get(connectPoint); 374 + Set<PortAddresses> addresses = portAddresses.get(connectPoint);
410 - }
411 375
412 if (addresses == null) { 376 if (addresses == null) {
413 - addresses = new PortAddresses(connectPoint, null, null); 377 + return Collections.emptySet();
378 + } else {
379 + return ImmutableSet.copyOf(addresses);
380 + }
414 } 381 }
415 -
416 - return addresses;
417 } 382 }
418 383
419 // Auxiliary extension to allow location to mutate. 384 // Auxiliary extension to allow location to mutate.
......
...@@ -447,13 +447,16 @@ implements MastershipStore { ...@@ -447,13 +447,16 @@ implements MastershipStore {
447 RoleValue oldValue = event.getOldValue(); 447 RoleValue oldValue = event.getOldValue();
448 RoleValue newValue = event.getValue(); 448 RoleValue newValue = event.getValue();
449 449
450 + // There will be no oldValue at the very first instance of an EntryEvent.
451 + // Technically, the progression is: null event -> null master -> some master;
452 + // We say a null master and a null oldValue are the same condition.
450 NodeId oldMaster = null; 453 NodeId oldMaster = null;
451 if (oldValue != null) { 454 if (oldValue != null) {
452 oldMaster = oldValue.get(MASTER); 455 oldMaster = oldValue.get(MASTER);
453 } 456 }
454 NodeId newMaster = newValue.get(MASTER); 457 NodeId newMaster = newValue.get(MASTER);
455 458
456 - if (Objects.equal(oldMaster, newMaster)) { 459 + if (!Objects.equal(oldMaster, newMaster)) {
457 notifyDelegate(new MastershipEvent( 460 notifyDelegate(new MastershipEvent(
458 MASTER_CHANGED, event.getKey(), event.getValue().roleInfo())); 461 MASTER_CHANGED, event.getKey(), event.getValue().roleInfo()));
459 } else { 462 } else {
......
...@@ -15,10 +15,18 @@ ...@@ -15,10 +15,18 @@
15 */ 15 */
16 package org.onlab.onos.store.trivial.impl; 16 package org.onlab.onos.store.trivial.impl;
17 17
18 -import com.google.common.collect.HashMultimap; 18 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
19 -import com.google.common.collect.ImmutableSet; 19 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED;
20 -import com.google.common.collect.Multimap; 20 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_REMOVED;
21 -import com.google.common.collect.Sets; 21 +import static org.onlab.onos.net.host.HostEvent.Type.HOST_UPDATED;
22 +import static org.slf4j.LoggerFactory.getLogger;
23 +
24 +import java.util.Collections;
25 +import java.util.HashSet;
26 +import java.util.Map;
27 +import java.util.Set;
28 +import java.util.concurrent.ConcurrentHashMap;
29 +
22 import org.apache.felix.scr.annotations.Activate; 30 import org.apache.felix.scr.annotations.Activate;
23 import org.apache.felix.scr.annotations.Component; 31 import org.apache.felix.scr.annotations.Component;
24 import org.apache.felix.scr.annotations.Deactivate; 32 import org.apache.felix.scr.annotations.Deactivate;
...@@ -34,7 +42,6 @@ import org.onlab.onos.net.host.HostDescription; ...@@ -34,7 +42,6 @@ import org.onlab.onos.net.host.HostDescription;
34 import org.onlab.onos.net.host.HostEvent; 42 import org.onlab.onos.net.host.HostEvent;
35 import org.onlab.onos.net.host.HostStore; 43 import org.onlab.onos.net.host.HostStore;
36 import org.onlab.onos.net.host.HostStoreDelegate; 44 import org.onlab.onos.net.host.HostStoreDelegate;
37 -import org.onlab.onos.net.host.InterfaceIpAddress;
38 import org.onlab.onos.net.host.PortAddresses; 45 import org.onlab.onos.net.host.PortAddresses;
39 import org.onlab.onos.net.provider.ProviderId; 46 import org.onlab.onos.net.provider.ProviderId;
40 import org.onlab.onos.store.AbstractStore; 47 import org.onlab.onos.store.AbstractStore;
...@@ -43,13 +50,11 @@ import org.onlab.packet.MacAddress; ...@@ -43,13 +50,11 @@ import org.onlab.packet.MacAddress;
43 import org.onlab.packet.VlanId; 50 import org.onlab.packet.VlanId;
44 import org.slf4j.Logger; 51 import org.slf4j.Logger;
45 52
46 -import java.util.HashSet; 53 +import com.google.common.collect.HashMultimap;
47 -import java.util.Map; 54 +import com.google.common.collect.ImmutableSet;
48 -import java.util.Set; 55 +import com.google.common.collect.Multimap;
49 -import java.util.concurrent.ConcurrentHashMap; 56 +import com.google.common.collect.Multimaps;
50 - 57 +import com.google.common.collect.SetMultimap;
51 -import static org.onlab.onos.net.host.HostEvent.Type.*;
52 -import static org.slf4j.LoggerFactory.getLogger;
53 58
54 // TODO: multi-provider, annotation not supported. 59 // TODO: multi-provider, annotation not supported.
55 /** 60 /**
...@@ -70,8 +75,9 @@ public class SimpleHostStore ...@@ -70,8 +75,9 @@ public class SimpleHostStore
70 // Hosts tracked by their location 75 // Hosts tracked by their location
71 private final Multimap<ConnectPoint, Host> locations = HashMultimap.create(); 76 private final Multimap<ConnectPoint, Host> locations = HashMultimap.create();
72 77
73 - private final Map<ConnectPoint, PortAddresses> portAddresses = 78 + private final SetMultimap<ConnectPoint, PortAddresses> portAddresses =
74 - new ConcurrentHashMap<>(); 79 + Multimaps.synchronizedSetMultimap(
80 + HashMultimap.<ConnectPoint, PortAddresses>create());
75 81
76 @Activate 82 @Activate
77 public void activate() { 83 public void activate() {
...@@ -213,77 +219,37 @@ public class SimpleHostStore ...@@ -213,77 +219,37 @@ public class SimpleHostStore
213 219
214 @Override 220 @Override
215 public void updateAddressBindings(PortAddresses addresses) { 221 public void updateAddressBindings(PortAddresses addresses) {
216 - synchronized (portAddresses) {
217 - PortAddresses existing = portAddresses.get(addresses.connectPoint());
218 - if (existing == null) {
219 portAddresses.put(addresses.connectPoint(), addresses); 222 portAddresses.put(addresses.connectPoint(), addresses);
220 - } else {
221 - Set<InterfaceIpAddress> union =
222 - Sets.union(existing.ipAddresses(),
223 - addresses.ipAddresses()).immutableCopy();
224 -
225 - MacAddress newMac = (addresses.mac() == null) ? existing.mac()
226 - : addresses.mac();
227 -
228 - PortAddresses newAddresses =
229 - new PortAddresses(addresses.connectPoint(), union, newMac);
230 -
231 - portAddresses.put(newAddresses.connectPoint(), newAddresses);
232 - }
233 - }
234 } 223 }
235 224
236 @Override 225 @Override
237 public void removeAddressBindings(PortAddresses addresses) { 226 public void removeAddressBindings(PortAddresses addresses) {
238 - synchronized (portAddresses) { 227 + portAddresses.remove(addresses.connectPoint(), addresses);
239 - PortAddresses existing = portAddresses.get(addresses.connectPoint());
240 - if (existing != null) {
241 - Set<InterfaceIpAddress> difference =
242 - Sets.difference(existing.ipAddresses(),
243 - addresses.ipAddresses()).immutableCopy();
244 -
245 - // If they removed the existing mac, set the new mac to null.
246 - // Otherwise, keep the existing mac.
247 - MacAddress newMac = existing.mac();
248 - if (addresses.mac() != null && addresses.mac().equals(existing.mac())) {
249 - newMac = null;
250 - }
251 -
252 - PortAddresses newAddresses =
253 - new PortAddresses(addresses.connectPoint(), difference, newMac);
254 -
255 - portAddresses.put(newAddresses.connectPoint(), newAddresses);
256 - }
257 - }
258 } 228 }
259 229
260 @Override 230 @Override
261 public void clearAddressBindings(ConnectPoint connectPoint) { 231 public void clearAddressBindings(ConnectPoint connectPoint) {
262 - synchronized (portAddresses) { 232 + portAddresses.removeAll(connectPoint);
263 - portAddresses.remove(connectPoint);
264 - }
265 } 233 }
266 234
267 @Override 235 @Override
268 public Set<PortAddresses> getAddressBindings() { 236 public Set<PortAddresses> getAddressBindings() {
269 synchronized (portAddresses) { 237 synchronized (portAddresses) {
270 - return new HashSet<>(portAddresses.values()); 238 + return ImmutableSet.copyOf(portAddresses.values());
271 } 239 }
272 } 240 }
273 241
274 @Override 242 @Override
275 - public PortAddresses getAddressBindingsForPort(ConnectPoint connectPoint) { 243 + public Set<PortAddresses> getAddressBindingsForPort(ConnectPoint connectPoint) {
276 - PortAddresses addresses;
277 -
278 synchronized (portAddresses) { 244 synchronized (portAddresses) {
279 - addresses = portAddresses.get(connectPoint); 245 + Set<PortAddresses> addresses = portAddresses.get(connectPoint);
280 - }
281 246
282 if (addresses == null) { 247 if (addresses == null) {
283 - addresses = new PortAddresses(connectPoint, null, null); 248 + return Collections.emptySet();
249 + } else {
250 + return ImmutableSet.copyOf(addresses);
251 + }
284 } 252 }
285 -
286 - return addresses;
287 } 253 }
288 254
289 // Auxiliary extension to allow location to mutate. 255 // Auxiliary extension to allow location to mutate.
......
...@@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next} ...@@ -5,7 +5,7 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next}
5 5
6 # M2 repository and Karaf gold bits 6 # M2 repository and Karaf gold bits
7 export M2_REPO=${M2_REPO:-~/.m2/repository} 7 export M2_REPO=${M2_REPO:-~/.m2/repository}
8 -export KARAF_VERSION=${KARAF_VERSION:-3.0.1} 8 +export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
9 export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip} 9 export KARAF_ZIP=${KARAF_ZIP:-~/Downloads/apache-karaf-$KARAF_VERSION.zip}
10 export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz} 10 export KARAF_TAR=${KARAF_TAR:-~/Downloads/apache-karaf-$KARAF_VERSION.tar.gz}
11 export KARAF_DIST=$(basename $KARAF_ZIP .zip) 11 export KARAF_DIST=$(basename $KARAF_ZIP .zip)
......
...@@ -8,7 +8,9 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next} ...@@ -8,7 +8,9 @@ export ONOS_ROOT=${ONOS_ROOT:-~/onos-next}
8 # Setup some environmental context for developers 8 # Setup some environmental context for developers
9 if [ -z "${JAVA_HOME}" ]; then 9 if [ -z "${JAVA_HOME}" ]; then
10 if [ -x /usr/libexec/java_home ]; then 10 if [ -x /usr/libexec/java_home ]; then
11 - export JAVA_HOME=$(/usr/libexec/java_home -v 1.7) 11 + export JAVA_HOME=$(/usr/libexec/java_home -v 1.8)
12 + elif [ -d /usr/lib/jvm/java-8-oracle ]; then
13 + export JAVA_HOME="/usr/lib/jvm/java-8-oracle"
12 elif [ -d /usr/lib/jvm/java-7-openjdk-amd64 ]; then 14 elif [ -d /usr/lib/jvm/java-7-openjdk-amd64 ]; then
13 export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64" 15 export JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64"
14 fi 16 fi
...@@ -16,7 +18,7 @@ fi ...@@ -16,7 +18,7 @@ fi
16 18
17 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2} 19 export MAVEN=${MAVEN:-~/Applications/apache-maven-3.2.2}
18 20
19 -export KARAF_VERSION=${KARAF_VERSION:-3.0.1} 21 +export KARAF_VERSION=${KARAF_VERSION:-3.0.2}
20 export KARAF=${KARAF:-~/Applications/apache-karaf-$KARAF_VERSION} 22 export KARAF=${KARAF:-~/Applications/apache-karaf-$KARAF_VERSION}
21 export KARAF_LOG=$KARAF/data/log/karaf.log 23 export KARAF_LOG=$KARAF/data/log/karaf.log
22 24
......
...@@ -6,4 +6,4 @@ export OC2="192.168.56.102" ...@@ -6,4 +6,4 @@ export OC2="192.168.56.102"
6 export OCN="192.168.56.103" 6 export OCN="192.168.56.103"
7 export OCI="${OC1}" 7 export OCI="${OC1}"
8 8
9 -export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-rest,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}" 9 +export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-gui,onos-rest,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}"
......
...@@ -7,4 +7,4 @@ export OC3="192.168.56.104" ...@@ -7,4 +7,4 @@ export OC3="192.168.56.104"
7 export OCN="192.168.56.103" 7 export OCN="192.168.56.103"
8 export OCI="${OC1}" 8 export OCI="${OC1}"
9 9
10 -export ONOS_FEATURES="" 10 +export ONOS_FEATURES="${ONOS_FEATURES:-webconsole,onos-api,onos-core,onos-cli,onos-openflow,onos-gui,onos-rest,onos-app-fwd,onos-app-proxyarp,onos-app-tvue}"
......
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + Geometry library - based on work by Mike Bostock.
19 + */
20 +
21 +(function() {
22 +
23 + if (typeof geo == 'undefined') {
24 + geo = {};
25 + }
26 +
27 + var tolerance = 1e-10;
28 +
29 + function eq(a, b) {
30 + return (Math.abs(a - b) < tolerance);
31 + }
32 +
33 + function gt(a, b) {
34 + return (a - b > -tolerance);
35 + }
36 +
37 + function lt(a, b) {
38 + return gt(b, a);
39 + }
40 +
41 + geo.eq = eq;
42 + geo.gt = gt;
43 + geo.lt = lt;
44 +
45 + geo.LineSegment = function(x1, y1, x2, y2) {
46 + this.x1 = x1;
47 + this.y1 = y1;
48 + this.x2 = x2;
49 + this.y2 = y2;
50 +
51 + // Ax + By = C
52 + this.a = y2 - y1;
53 + this.b = x1 - x2;
54 + this.c = x1 * this.a + y1 * this.b;
55 +
56 + if (eq(this.a, 0) && eq(this.b, 0)) {
57 + throw new Error(
58 + 'Cannot construct a LineSegment with two equal endpoints.');
59 + }
60 + };
61 +
62 + geo.LineSegment.prototype.intersect = function(that) {
63 + var d = (this.x1 - this.x2) * (that.y1 - that.y2) -
64 + (this.y1 - this.y2) * (that.x1 - that.x2);
65 +
66 + if (eq(d, 0)) {
67 + // The two lines are parallel or very close.
68 + return {
69 + x : NaN,
70 + y : NaN
71 + };
72 + }
73 +
74 + var t1 = this.x1 * this.y2 - this.y1 * this.x2,
75 + t2 = that.x1 * that.y2 - that.y1 * that.x2,
76 + x = (t1 * (that.x1 - that.x2) - t2 * (this.x1 - this.x2)) / d,
77 + y = (t1 * (that.y1 - that.y2) - t2 * (this.y1 - this.y2)) / d,
78 + in1 = (gt(x, Math.min(this.x1, this.x2)) && lt(x, Math.max(this.x1, this.x2)) &&
79 + gt(y, Math.min(this.y1, this.y2)) && lt(y, Math.max(this.y1, this.y2))),
80 + in2 = (gt(x, Math.min(that.x1, that.x2)) && lt(x, Math.max(that.x1, that.x2)) &&
81 + gt(y, Math.min(that.y1, that.y2)) && lt(y, Math.max(that.y1, that.y2)));
82 +
83 + return {
84 + x : x,
85 + y : y,
86 + in1 : in1,
87 + in2 : in2
88 + };
89 + };
90 +
91 + geo.LineSegment.prototype.x = function(y) {
92 + // x = (C - By) / a;
93 + if (this.a) {
94 + return (this.c - this.b * y) / this.a;
95 + } else {
96 + // a == 0 -> horizontal line
97 + return NaN;
98 + }
99 + };
100 +
101 + geo.LineSegment.prototype.y = function(x) {
102 + // y = (C - Ax) / b;
103 + if (this.b) {
104 + return (this.c - this.a * x) / this.b;
105 + } else {
106 + // b == 0 -> vertical line
107 + return NaN;
108 + }
109 + };
110 +
111 + geo.LineSegment.prototype.length = function() {
112 + return Math.sqrt(
113 + (this.y2 - this.y1) * (this.y2 - this.y1) +
114 + (this.x2 - this.x1) * (this.x2 - this.x1));
115 + };
116 +
117 + geo.LineSegment.prototype.offset = function(x, y) {
118 + return new geo.LineSegment(
119 + this.x1 + x, this.y1 + y,
120 + this.x2 + x, this.y2 + y);
121 + };
122 +
123 +})();
1 +<!DOCTYPE html>
2 +<!--
3 + ~ Copyright 2014 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +
18 +<!--
19 + ONOS UI - single page web app
20 + Version 1.1
21 +
22 + @author Simon Hunt
23 + -->
24 +<html>
25 +<head>
26 + <meta charset="utf-8">
27 + <title>ONOS GUI (v1.1)</title>
28 +
29 + <link rel="shortcut icon" href="img/onos-logo.png">
30 +
31 + <!-- first script to be run -->
32 + <script src="preamble.js"></script>
33 +
34 + <!-- Third party library code included here -->
35 + <!--TODO: use the minified version of d3, once debugging is complete -->
36 + <script src="libs/d3.js"></script>
37 + <script src="libs/jquery-2.1.1.min.js"></script>
38 +
39 + <!-- Base library and framework stylesheets included here -->
40 + <link rel="stylesheet" href="base.css">
41 + <link rel="stylesheet" href="onos2.css">
42 + <link rel="stylesheet" href="mast2.css">
43 +
44 + <!-- This is where contributed stylesheets get INJECTED -->
45 + <!-- TODO: replace with template marker and inject refs server-side -->
46 + <link rel="stylesheet" href="topo2.css">
47 +
48 +
49 + <!-- General library modules included here-->
50 + <script src="geometry2.js"></script>
51 +
52 + <!-- ONOS UI Framework included here-->
53 + <script src="onos2.js"></script>
54 +
55 +</head>
56 +<body>
57 + <div id="frame">
58 + <div id="mast">
59 + <!-- NOTE: masthead injected here by mast.js -->
60 + </div>
61 + <div id="view">
62 + <!-- NOTE: views injected here by onos.js -->
63 + </div>
64 + <div id="overlays">
65 + <!-- NOTE: overlays injected here, as needed -->
66 + </div>
67 + </div>
68 +
69 + <!-- Initialize the UI...-->
70 + <script type="text/javascript">
71 + var ONOS = $.onos({note: "config, if needed"});
72 + </script>
73 +
74 + <!-- Framework module files included here -->
75 + <script src="mast2.js"></script>
76 +
77 + <!-- Contributed (application) views injected here -->
78 + <!-- TODO: replace with template marker and inject refs server-side -->
79 + <script src="temp2.js"></script>
80 +
81 + <!-- finally, build the UI-->
82 + <script type="text/javascript">
83 + $(ONOS.buildUi);
84 + </script>
85 +
86 +</body>
87 +</html>
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + ONOS GUI -- Masthead -- CSS file
19 +
20 + @author Simon Hunt
21 + */
22 +
23 +#mast {
24 + height: 36px;
25 + padding: 4px;
26 + background-color: #bbb;
27 + vertical-align: baseline;
28 + box-shadow: 0px 2px 8px #777;
29 +}
30 +
31 +#mast img#logo {
32 + height: 38px;
33 + padding-left: 8px;
34 + padding-right: 8px;
35 +}
36 +
37 +#mast span.title {
38 + color: #369;
39 + font-size: 14pt;
40 + font-style: italic;
41 + vertical-align: 12px;
42 +}
43 +
44 +#mast span.right {
45 + padding-top: 8px;
46 + padding-right: 16px;
47 + float: right;
48 +}
49 +
50 +#mast span.radio {
51 + color: darkslateblue;
52 + font-size: 10pt;
53 +}
54 +
55 +#mast span.radio {
56 + margin: 4px 0;
57 + border: 1px dotted #222;
58 + padding: 1px 6px;
59 + color: #eee;
60 + cursor: pointer;
61 +}
62 +
63 +#mast span.radio.active {
64 + background-color: #bbb;
65 + border: 1px solid #eee;
66 + padding: 1px 6px;
67 + color: #666;
68 + font-weight: bold;
69 +}
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + ONOS GUI -- Masthead
19 +
20 + Defines the masthead for the UI. Injects logo and title, as well as providing
21 + the placeholder for a set of radio buttons.
22 +
23 + @author Simon Hunt
24 + */
25 +
26 +(function (onos){
27 + 'use strict';
28 +
29 + // API's
30 + var api = onos.api;
31 +
32 + // Config variables
33 + var guiTitle = 'Open Networking Operating System';
34 +
35 + // DOM elements and the like
36 + var mast = d3.select('#mast');
37 +
38 + mast.append('img')
39 + .attr({
40 + id: 'logo',
41 + src: 'img/onos-logo.png'
42 + });
43 +
44 + mast.append('span')
45 + .attr({
46 + class: 'title'
47 + })
48 + .text(guiTitle);
49 +
50 + mast.append('span')
51 + .attr({
52 + id: 'mastRadio',
53 + class: 'right'
54 + });
55 +
56 +}(ONOS));
...\ No newline at end of file ...\ No newline at end of file
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + ONOS GUI -- Base Framework -- CSS file
19 +
20 + @author Simon Hunt
21 + */
22 +
23 +html, body {
24 + height: 100%;
25 +}
26 +
27 +
28 +/*
29 + * === DEBUGGING ======
30 + */
31 +svg {
32 + /*border: 1px dashed red;*/
33 +}
34 +
35 +svg #bg {
36 + opacity: 0.5;
37 +}
38 +
39 +
40 +/*
41 + * Network Graph elements ======================================
42 + */
43 +
44 +svg .link {
45 + fill: none;
46 + stroke: #666;
47 + stroke-width: 2.0px;
48 + opacity: .7;
49 +
50 + transition: opacity 250ms;
51 + -webkit-transition: opacity 250ms;
52 + -moz-transition: opacity 250ms;
53 +}
54 +
55 +svg .link.host {
56 + stroke: #666;
57 + stroke-width: 1px;
58 +}
59 +
60 +svg g.portLayer rect.port {
61 + fill: #ccc;
62 +}
63 +
64 +svg g.portLayer text {
65 + font: 8pt sans-serif;
66 + pointer-events: none;
67 +}
68 +
69 +svg .node.device rect {
70 + stroke-width: 1.5px;
71 +
72 + transition: opacity 250ms;
73 + -webkit-transition: opacity 250ms;
74 + -moz-transition: opacity 250ms;
75 +}
76 +
77 +svg .node.device.fixed rect {
78 + stroke-width: 1.5;
79 + stroke: #ccc;
80 +}
81 +
82 +svg .node.device.roadm rect {
83 + fill: #03c;
84 +}
85 +
86 +svg .node.device.switch rect {
87 + fill: #06f;
88 +}
89 +
90 +svg .node.host circle {
91 + fill: #c96;
92 + stroke: #000;
93 +}
94 +
95 +svg .node text {
96 + fill: white;
97 + font: 10pt sans-serif;
98 + pointer-events: none;
99 +}
100 +
101 +/* for debugging */
102 +svg .node circle.debug {
103 + fill: white;
104 + stroke: red;
105 +}
106 +svg .node rect.debug {
107 + fill: yellow;
108 + stroke: red;
109 + opacity: 0.35;
110 +}
111 +
112 +
113 +svg .node.selected rect,
114 +svg .node.selected circle {
115 + filter: url(#blue-glow);
116 +}
117 +
118 +svg .link.inactive,
119 +svg .port.inactive,
120 +svg .portText.inactive,
121 +svg .node.inactive rect,
122 +svg .node.inactive circle,
123 +svg .node.inactive text,
124 +svg .node.inactive image {
125 + opacity: .1;
126 +}
127 +
128 +svg .node.inactive.selected rect,
129 +svg .node.inactive.selected text,
130 +svg .node.inactive.selected image {
131 + opacity: .6;
132 +}
133 +
134 +/*
135 + * =============================================================
136 + */
137 +
138 +/*
139 + * Specific structural elements
140 + */
141 +
142 +/* This is to ensure that the body does not expand to account for the
143 + flyout details pane, that is positioned "off screen".
144 + */
145 +body {
146 + overflow: hidden;
147 +}
148 +
149 +
150 +#frame {
151 + width: 100%;
152 + height: 100%;
153 + background-color: #fff;
154 +}
155 +
156 +#flyout {
157 + position: absolute;
158 + z-index: 100;
159 + display: block;
160 + top: 10%;
161 + width: 280px;
162 + right: -300px;
163 + opacity: 0;
164 + background-color: rgba(255,255,255,0.8);
165 +
166 + padding: 10px;
167 + color: black;
168 + font-size: 10pt;
169 + box-shadow: 2px 2px 16px #777;
170 +}
171 +
172 +#flyout h2 {
173 + margin: 8px 4px;
174 + color: black;
175 + vertical-align: middle;
176 +}
177 +
178 +#flyout h2 img {
179 + height: 32px;
180 + padding-right: 8px;
181 + vertical-align: middle;
182 +}
183 +
184 +#flyout p, table {
185 + margin: 4px 4px;
186 +}
187 +
188 +#flyout td.label {
189 + font-style: italic;
190 + color: #777;
191 + padding-right: 12px;
192 +}
193 +
194 +#flyout td.value {
195 +
196 +}
197 +
198 +#flyout hr {
199 + height: 1px;
200 + color: #ccc;
201 + background-color: #ccc;
202 + border: 0;
203 +}
204 +
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + ONOS GUI -- Base Framework
19 +
20 + @author Simon Hunt
21 + */
22 +
23 +(function ($) {
24 + 'use strict';
25 + var tsI = new Date().getTime(), // initialize time stamp
26 + tsB, // build time stamp
27 + defaultHash = 'temp1';
28 +
29 +
30 + // attach our main function to the jQuery object
31 + $.onos = function (options) {
32 + var publicApi; // public api
33 +
34 + // internal state
35 + var views = {},
36 + current = {
37 + view: null,
38 + ctx: ''
39 + },
40 + built = false,
41 + errorCount = 0;
42 +
43 + // DOM elements etc.
44 + var $view;
45 +
46 +
47 + // ..........................................................
48 + // Internal functions
49 +
50 + // throw an error
51 + function throwError(msg) {
52 + // separate function, as we might add tracing here too, later
53 + throw new Error(msg);
54 + }
55 +
56 + function doError(msg) {
57 + errorCount++;
58 + console.warn(msg);
59 + }
60 +
61 + // hash navigation
62 + function hash() {
63 + var hash = window.location.hash,
64 + redo = false,
65 + view,
66 + t;
67 +
68 + if (!hash) {
69 + hash = defaultHash;
70 + redo = true;
71 + }
72 +
73 + t = parseHash(hash);
74 + if (!t || !t.vid) {
75 + doError('Unable to parse target hash: ' + hash);
76 + }
77 +
78 + view = views[t.vid];
79 + if (!view) {
80 + doError('No view defined with id: ' + t.vid);
81 + }
82 +
83 + if (redo) {
84 + window.location.hash = makeHash(t);
85 + // the above will result in a hashchange event, invoking
86 + // this function again
87 + } else {
88 + // hash was not modified... navigate to where we need to be
89 + navigate(hash, view, t);
90 + }
91 +
92 + }
93 +
94 + function parseHash(s) {
95 + // extract navigation coordinates from the supplied string
96 + // "vid,ctx" --> { vid:vid, ctx:ctx }
97 +
98 + var m = /^[#]{0,1}(\S+),(\S*)$/.exec(s);
99 + if (m) {
100 + return { vid: m[1], ctx: m[2] };
101 + }
102 +
103 + m = /^[#]{0,1}(\S+)$/.exec(s);
104 + return m ? { vid: m[1] } : null;
105 + }
106 +
107 + function makeHash(t, ctx) {
108 + // make a hash string from the given navigation coordinates.
109 + // if t is not an object, then it is a vid
110 + var h = t,
111 + c = ctx || '';
112 +
113 + if ($.isPlainObject(t)) {
114 + h = t.vid;
115 + c = t.ctx || '';
116 + }
117 +
118 + if (c) {
119 + h += ',' + c;
120 + }
121 + return h;
122 + }
123 +
124 + function navigate(hash, view, t) {
125 + // closePanes() // flyouts etc.
126 + // updateNav() // accordion / selected nav item
127 + createView(view);
128 + setView(view, hash, t);
129 + }
130 +
131 + function reportBuildErrors() {
132 + // TODO: validate registered views / nav-item linkage etc.
133 + console.log('(no build errors)');
134 + }
135 +
136 + // ..........................................................
137 + // View life-cycle functions
138 +
139 + function createView(view) {
140 + var $d;
141 + // lazy initialization of the view
142 + if (view && !view.$div) {
143 + $d = $view.append('div')
144 + .attr({
145 + id: view.vid
146 + });
147 + view.$div = $d; // cache a reference to the selected div
148 + }
149 + }
150 +
151 + function setView(view, hash, t) {
152 + // set the specified view as current, while invoking the
153 + // appropriate life-cycle callbacks
154 +
155 + // if there is a current view, and it is not the same as
156 + // the incoming view, then unload it...
157 + if (current.view && !(current.view.vid !== view.vid)) {
158 + current.view.unload();
159 + }
160 +
161 + // cache new view and context
162 + current.view = view;
163 + current.ctx = t.ctx || '';
164 +
165 + // TODO: clear radio button set (store on view?)
166 +
167 + // preload is called only once, after the view is in the DOM
168 + if (!view.preloaded) {
169 + view.preload(t.ctx);
170 + }
171 +
172 + // clear the view of stale data
173 + view.reset();
174 +
175 + // load the view
176 + view.load(t.ctx);
177 + }
178 +
179 + function resizeView() {
180 + if (current.view) {
181 + current.view.resize();
182 + }
183 + }
184 +
185 + // ..........................................................
186 + // View class
187 + // Captures state information about a view.
188 +
189 + // Constructor
190 + // vid : view id
191 + // nid : id of associated nav-item (optional)
192 + // cb : callbacks (preload, reset, load, resize, unload, error)
193 + // data: custom data object (optional)
194 + function View(vid) {
195 + var av = 'addView(): ',
196 + args = Array.prototype.slice.call(arguments),
197 + nid,
198 + cb,
199 + data;
200 +
201 + args.shift(); // first arg is always vid
202 + if (typeof args[0] === 'string') { // nid specified
203 + nid = args.shift();
204 + }
205 + cb = args.shift();
206 + data = args.shift();
207 +
208 + this.vid = vid;
209 +
210 + if (validateViewArgs(vid)) {
211 + this.nid = nid; // explicit navitem id (can be null)
212 + this.cb = $.isPlainObject(cb) ? cb : {}; // callbacks
213 + this.data = data; // custom data (can be null)
214 + this.$div = null; // view not yet added to DOM
215 + this.ok = true; // valid view
216 + }
217 +
218 + }
219 +
220 + function validateViewArgs(vid) {
221 + var ok = false;
222 + if (typeof vid !== 'string' || !vid) {
223 + doError(av + 'vid required');
224 + } else if (views[vid]) {
225 + doError(av + 'View ID "' + vid + '" already exists');
226 + } else {
227 + ok = true;
228 + }
229 + return ok;
230 + }
231 +
232 + var viewInstanceMethods = {
233 + toString: function () {
234 + return '[View: id="' + this.vid + '"]';
235 + },
236 +
237 + token: function() {
238 + return {
239 + vid: this.vid,
240 + nid: this.nid,
241 + data: this.data
242 + }
243 + }
244 + // TODO: create, preload, reset, load, error, resize, unload
245 + };
246 +
247 + // attach instance methods to the view prototype
248 + $.extend(View.prototype, viewInstanceMethods);
249 +
250 + // ..........................................................
251 + // Exported API
252 +
253 + publicApi = {
254 + printTime: function () {
255 + console.log("the time is " + new Date());
256 + },
257 +
258 + addView: function (vid, nid, cb, data) {
259 + var view = new View(vid, nid, cb, data),
260 + token;
261 + if (view.ok) {
262 + views[vid] = view;
263 + token = view.token();
264 + } else {
265 + token = { vid: view.vid, bad: true };
266 + }
267 + return token;
268 + }
269 + };
270 +
271 + // function to be called from index.html to build the ONOS UI
272 + function buildOnosUi() {
273 + tsB = new Date().getTime();
274 + tsI = tsB - tsI; // initialization duration
275 +
276 + console.log('ONOS UI initialized in ' + tsI + 'ms');
277 +
278 + if (built) {
279 + throwError("ONOS UI already built!");
280 + }
281 + built = true;
282 +
283 + $view = d3.select('#view');
284 +
285 + $(window).on('hashchange', hash);
286 +
287 + // Invoke hashchange callback to navigate to content
288 + // indicated by the window location hash.
289 + hash();
290 +
291 + // If there were any build errors, report them
292 + reportBuildErrors();
293 + }
294 +
295 +
296 + // export the api and build-UI function
297 + return {
298 + api: publicApi,
299 + buildUi: buildOnosUi
300 + };
301 + };
302 +
303 +}(jQuery));
...\ No newline at end of file ...\ No newline at end of file
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + ONOS GUI -- Preamble -- the first thing we do
19 +
20 + @author Simon Hunt
21 + */
22 +
23 +(function () {
24 + // Check if the URL in the address bar contains a parameter section
25 + // (delineated by '?'). If this is the case, rewrite using '#' instead.
26 +
27 + var m = /([^?]*)\?(.*)/.exec(window.location.href);
28 + if (m) {
29 + window.location.href = m[1] + '#' + m[2];
30 + }
31 +
32 +}());
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + Temporary module file to test the framework integration.
19 +
20 + @author Simon Hunt
21 + */
22 +
23 +(function (onos) {
24 + 'use strict';
25 +
26 + var api = onos.api;
27 +
28 + var vid,
29 + svg;
30 +
31 + // == define your functions here.....
32 +
33 +
34 + // NOTE: view is a data structure:
35 + // {
36 + // id: 'view-id',
37 + // el: ... // d3 selection of dom view div.
38 + // }
39 +
40 + function load(view) {
41 + vid = view.id;
42 + svg = view.el.append('svg')
43 + .attr({
44 + width: 400,
45 + height: 300
46 + });
47 +
48 + var fill = (vid === 'temp1') ? 'red' : 'blue',
49 + stroke = (vid === 'temp2') ? 'yellow' : 'black';
50 +
51 + svg.append('circle')
52 + .attr({
53 + cx: 200,
54 + cy: 150,
55 + r: 30
56 + })
57 + .style({
58 + fill: fill,
59 + stroke: stroke,
60 + 'stroke-width': 3.5
61 + });
62 + }
63 +
64 + // == register views here, with links to lifecycle callbacks
65 +
66 + api.addView('temp1', {
67 + load: load
68 + });
69 +
70 + api.addView('temp2', {
71 + load: load
72 + });
73 +
74 +
75 +}(ONOS));
1 +/*
2 + * Copyright 2014 Open Networking Laboratory
3 + *
4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
7 + *
8 + * http://www.apache.org/licenses/LICENSE-2.0
9 + *
10 + * Unless required by applicable law or agreed to in writing, software
11 + * distributed under the License is distributed on an "AS IS" BASIS,
12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
15 + */
16 +
17 +/*
18 + ONOS GUI -- Topology view -- CSS file
19 +
20 + @author Simon Hunt
21 + */
22 +
This diff is collapsed. Click to expand it.