홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
9fe723aa 2 parents cf8dd2a3 6245a7a2

Merge remote-tracking branch 'origin/master'

Expand all
Inline Side-by-side
Showing 39 changed files with 611 additions and 415 deletions
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
28 <dependency> 28 <dependency>
29 <groupId>com.fasterxml.jackson.core</groupId> 29 <groupId>com.fasterxml.jackson.core</groupId>
30 <artifactId>jackson-annotations</artifactId> 30 <artifactId>jackson-annotations</artifactId>
31 - <version>2.4.2</version> 31 + </dependency>
32 - <scope>provided</scope> 32 + <dependency>
33 + <groupId>org.onlab.onos</groupId>
34 + <artifactId>onlab-misc</artifactId>
33 </dependency> 35 </dependency>
34 </dependencies> 36 </dependencies>
35 37
......
...@@ -41,5 +41,17 @@ ...@@ -41,5 +41,17 @@
41 <groupId>org.apache.karaf.shell</groupId> 41 <groupId>org.apache.karaf.shell</groupId>
42 <artifactId>org.apache.karaf.shell.console</artifactId> 42 <artifactId>org.apache.karaf.shell.console</artifactId>
43 </dependency> 43 </dependency>
44 + <dependency>
45 + <groupId>org.onlab.onos</groupId>
46 + <artifactId>onlab-misc</artifactId>
47 + </dependency>
48 + <dependency>
49 + <groupId>com.google.guava</groupId>
50 + <artifactId>guava</artifactId>
51 + </dependency>
52 + <dependency>
53 + <groupId>org.osgi</groupId>
54 + <artifactId>org.osgi.core</artifactId>
55 + </dependency>
44 </dependencies> 56 </dependencies>
45 </project> 57 </project>
......
...@@ -4,8 +4,6 @@ import java.io.IOException; ...@@ -4,8 +4,6 @@ import java.io.IOException;
4 4
5 import org.onlab.netty.Message; 5 import org.onlab.netty.Message;
6 import org.onlab.netty.MessageHandler; 6 import org.onlab.netty.MessageHandler;
7 -import org.slf4j.Logger;
8 -import org.slf4j.LoggerFactory;
9 7
10 8
11 /** 9 /**
...@@ -13,11 +11,8 @@ import org.slf4j.LoggerFactory; ...@@ -13,11 +11,8 @@ import org.slf4j.LoggerFactory;
13 */ 11 */
14 public class NettyEchoHandler implements MessageHandler { 12 public class NettyEchoHandler implements MessageHandler {
15 13
16 - private final Logger log = LoggerFactory.getLogger(getClass());
17 -
18 @Override 14 @Override
19 public void handle(Message message) throws IOException { 15 public void handle(Message message) throws IOException {
20 - //log.info("Received message. Echoing it back to the sender.");
21 message.respond(message.payload()); 16 message.respond(message.payload());
22 } 17 }
23 } 18 }
......
...@@ -8,12 +8,12 @@ import org.slf4j.LoggerFactory; ...@@ -8,12 +8,12 @@ import org.slf4j.LoggerFactory;
8 /** 8 /**
9 * A MessageHandler that simply logs the information. 9 * A MessageHandler that simply logs the information.
10 */ 10 */
11 -public class NettyLoggingHandler implements MessageHandler { 11 +public class NettyNothingHandler implements MessageHandler {
12 12
13 private final Logger log = LoggerFactory.getLogger(getClass()); 13 private final Logger log = LoggerFactory.getLogger(getClass());
14 14
15 @Override 15 @Override
16 public void handle(Message message) { 16 public void handle(Message message) {
17 - //log.info("Received message. Payload has {} bytes", message.payload().length); 17 + // Do nothing
18 } 18 }
19 } 19 }
......
1 package org.onlab.onos.foo; 1 package org.onlab.onos.foo;
2 2
3 +import static java.lang.Thread.sleep;
4 +
3 import java.io.IOException; 5 import java.io.IOException;
4 import java.util.concurrent.ExecutionException; 6 import java.util.concurrent.ExecutionException;
7 +import java.util.concurrent.TimeUnit;
5 import java.util.concurrent.TimeoutException; 8 import java.util.concurrent.TimeoutException;
6 9
7 import org.onlab.metrics.MetricsComponent; 10 import org.onlab.metrics.MetricsComponent;
...@@ -15,14 +18,29 @@ import org.slf4j.LoggerFactory; ...@@ -15,14 +18,29 @@ import org.slf4j.LoggerFactory;
15 18
16 import com.codahale.metrics.Timer; 19 import com.codahale.metrics.Timer;
17 20
21 +/**
22 + * The Simple netty client test.
23 + */
18 // FIXME: Should be move out to test or app 24 // FIXME: Should be move out to test or app
19 public final class SimpleNettyClient { 25 public final class SimpleNettyClient {
20 26
21 private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class); 27 private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class);
22 28
29 + static NettyMessagingService messaging;
30 + static MetricsManager metrics;
31 +
23 private SimpleNettyClient() { 32 private SimpleNettyClient() {
24 } 33 }
25 34
35 + /**
36 + * The entry point of application.
37 + *
38 + * @param args the input arguments
39 + * @throws IOException the iO exception
40 + * @throws InterruptedException the interrupted exception
41 + * @throws ExecutionException the execution exception
42 + * @throws TimeoutException the timeout exception
43 + */
26 public static void main(String[] args) 44 public static void main(String[] args)
27 throws IOException, InterruptedException, ExecutionException, 45 throws IOException, InterruptedException, ExecutionException,
28 TimeoutException { 46 TimeoutException {
...@@ -34,13 +52,20 @@ private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class); ...@@ -34,13 +52,20 @@ private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class);
34 52
35 System.exit(0); 53 System.exit(0);
36 } 54 }
55 +
56 + /**
57 + * Start standalone.
58 + *
59 + * @param args the args
60 + * @throws Exception the exception
61 + */
37 public static void startStandalone(String[] args) throws Exception { 62 public static void startStandalone(String[] args) throws Exception {
38 String host = args.length > 0 ? args[0] : "localhost"; 63 String host = args.length > 0 ? args[0] : "localhost";
39 int port = args.length > 1 ? Integer.parseInt(args[1]) : 8081; 64 int port = args.length > 1 ? Integer.parseInt(args[1]) : 8081;
40 int warmup = args.length > 2 ? Integer.parseInt(args[2]) : 1000; 65 int warmup = args.length > 2 ? Integer.parseInt(args[2]) : 1000;
41 int iterations = args.length > 3 ? Integer.parseInt(args[3]) : 50 * 100000; 66 int iterations = args.length > 3 ? Integer.parseInt(args[3]) : 50 * 100000;
42 - NettyMessagingService messaging = new TestNettyMessagingService(9081); 67 + messaging = new TestNettyMessagingService(9081);
43 - MetricsManager metrics = new MetricsManager(); 68 + metrics = new MetricsManager();
44 Endpoint endpoint = new Endpoint(host, port); 69 Endpoint endpoint = new Endpoint(host, port);
45 messaging.activate(); 70 messaging.activate();
46 metrics.activate(); 71 metrics.activate();
...@@ -53,8 +78,31 @@ private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class); ...@@ -53,8 +78,31 @@ private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class);
53 Response response = messaging 78 Response response = messaging
54 .sendAndReceive(endpoint, "echo", 79 .sendAndReceive(endpoint, "echo",
55 "Hello World".getBytes()); 80 "Hello World".getBytes());
81 + response.get(100000, TimeUnit.MILLISECONDS);
82 + }
83 +
84 + log.info("measuring round-trip send & receive");
85 + Timer sendAndReceiveTimer = metrics.createTimer(component, feature, "SendAndReceive");
86 + int timeouts = 0;
87 +
88 + for (int i = 0; i < iterations; i++) {
89 + Response response;
90 + Timer.Context context = sendAndReceiveTimer.time();
91 + try {
92 + response = messaging
93 + .sendAndReceive(endpoint, "echo",
94 + "Hello World".getBytes());
95 + response.get(10000, TimeUnit.MILLISECONDS);
96 + } catch (TimeoutException e) {
97 + timeouts++;
98 + log.info("timeout:" + timeouts + " at iteration:" + i);
99 + } finally {
100 + context.stop();
101 + }
102 + // System.out.println("Got back:" + new String(response.get(2, TimeUnit.SECONDS)));
56 } 103 }
57 104
105 + sleep(1000);
58 log.info("measuring async sender"); 106 log.info("measuring async sender");
59 Timer sendAsyncTimer = metrics.createTimer(component, feature, "AsyncSender"); 107 Timer sendAsyncTimer = metrics.createTimer(component, feature, "AsyncSender");
60 108
...@@ -63,20 +111,28 @@ private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class); ...@@ -63,20 +111,28 @@ private static Logger log = LoggerFactory.getLogger(SimpleNettyClient.class);
63 messaging.sendAsync(endpoint, "simple", "Hello World".getBytes()); 111 messaging.sendAsync(endpoint, "simple", "Hello World".getBytes());
64 context.stop(); 112 context.stop();
65 } 113 }
66 - 114 + sleep(1000);
67 - Timer sendAndReceiveTimer = metrics.createTimer(component, feature, "SendAndReceive");
68 - for (int i = 0; i < iterations; i++) {
69 - Timer.Context context = sendAndReceiveTimer.time();
70 - Response response = messaging
71 - .sendAndReceive(endpoint, "echo",
72 - "Hello World".getBytes());
73 - // System.out.println("Got back:" + new String(response.get(2, TimeUnit.SECONDS)));
74 - context.stop();
75 } 115 }
116 +
117 + public static void stop() {
118 + try {
119 + messaging.deactivate();
76 metrics.deactivate(); 120 metrics.deactivate();
121 + } catch (Exception e) {
122 + log.info("Unable to stop client %s", e);
123 + }
77 } 124 }
78 125
126 + /**
127 + * The type Test netty messaging service.
128 + */
79 public static class TestNettyMessagingService extends NettyMessagingService { 129 public static class TestNettyMessagingService extends NettyMessagingService {
130 + /**
131 + * Instantiates a new Test netty messaging service.
132 + *
133 + * @param port the port
134 + * @throws Exception the exception
135 + */
80 public TestNettyMessagingService(int port) throws Exception { 136 public TestNettyMessagingService(int port) throws Exception {
81 super(port); 137 super(port);
82 } 138 }
......
1 package org.onlab.onos.foo; 1 package org.onlab.onos.foo;
2 2
3 import static org.onlab.onos.foo.SimpleNettyClient.startStandalone; 3 import static org.onlab.onos.foo.SimpleNettyClient.startStandalone;
4 +import static org.onlab.onos.foo.SimpleNettyClient.stop;
4 5
5 import org.apache.karaf.shell.commands.Argument; 6 import org.apache.karaf.shell.commands.Argument;
6 import org.apache.karaf.shell.commands.Command; 7 import org.apache.karaf.shell.commands.Command;
...@@ -10,7 +11,7 @@ import org.onlab.onos.cli.AbstractShellCommand; ...@@ -10,7 +11,7 @@ import org.onlab.onos.cli.AbstractShellCommand;
10 * Test Netty client performance. 11 * Test Netty client performance.
11 */ 12 */
12 @Command(scope = "onos", name = "simple-netty-client", 13 @Command(scope = "onos", name = "simple-netty-client",
13 - description = "Starts the simple Netty client") 14 + description = "Starts simple Netty client")
14 public class SimpleNettyClientCommand extends AbstractShellCommand { 15 public class SimpleNettyClientCommand extends AbstractShellCommand {
15 16
16 //FIXME: replace these arguments with proper ones needed for the test. 17 //FIXME: replace these arguments with proper ones needed for the test.
...@@ -28,7 +29,7 @@ public class SimpleNettyClientCommand extends AbstractShellCommand { ...@@ -28,7 +29,7 @@ public class SimpleNettyClientCommand extends AbstractShellCommand {
28 29
29 @Argument(index = 3, name = "messageCount", description = "Message count", 30 @Argument(index = 3, name = "messageCount", description = "Message count",
30 required = false, multiValued = false) 31 required = false, multiValued = false)
31 - String messageCount = "100000"; 32 + String messageCount = "1000000";
32 33
33 @Override 34 @Override
34 protected void execute() { 35 protected void execute() {
...@@ -37,5 +38,6 @@ public class SimpleNettyClientCommand extends AbstractShellCommand { ...@@ -37,5 +38,6 @@ public class SimpleNettyClientCommand extends AbstractShellCommand {
37 } catch (Exception e) { 38 } catch (Exception e) {
38 error("Unable to start client %s", e); 39 error("Unable to start client %s", e);
39 } 40 }
41 + stop();
40 } 42 }
41 } 43 }
......
...@@ -12,16 +12,30 @@ import org.slf4j.LoggerFactory; ...@@ -12,16 +12,30 @@ import org.slf4j.LoggerFactory;
12 12
13 private SimpleNettyServer() {} 13 private SimpleNettyServer() {}
14 14
15 + /**
16 + * The entry point of application.
17 + *
18 + * @param args the input arguments
19 + * @throws Exception the exception
20 + */
15 public static void main(String... args) throws Exception { 21 public static void main(String... args) throws Exception {
16 startStandalone(args); 22 startStandalone(args);
17 System.exit(0); 23 System.exit(0);
18 } 24 }
19 25
26 + /**
27 + * Start standalone server.
28 + *
29 + * @param args the args
30 + * @throws Exception the exception
31 + */
20 public static void startStandalone(String[] args) throws Exception { 32 public static void startStandalone(String[] args) throws Exception {
21 - NettyMessagingService server = new NettyMessagingService(8081); 33 + int port = args.length > 0 ? Integer.parseInt(args[0]) : 8081;
34 + NettyMessagingService server = new NettyMessagingService(port);
22 server.activate(); 35 server.activate();
23 - server.registerHandler("simple", new NettyLoggingHandler()); 36 + server.registerHandler("simple", new NettyNothingHandler());
24 server.registerHandler("echo", new NettyEchoHandler()); 37 server.registerHandler("echo", new NettyEchoHandler());
38 + log.info("Netty Server server on port " + port);
25 } 39 }
26 } 40 }
27 41
......
...@@ -10,26 +10,18 @@ import org.onlab.onos.cli.AbstractShellCommand; ...@@ -10,26 +10,18 @@ import org.onlab.onos.cli.AbstractShellCommand;
10 * Starts the Simple Netty server. 10 * Starts the Simple Netty server.
11 */ 11 */
12 @Command(scope = "onos", name = "simple-netty-server", 12 @Command(scope = "onos", name = "simple-netty-server",
13 - description = "Starts the simple netty server") 13 + description = "Starts simple Netty server")
14 public class SimpleNettyServerCommand extends AbstractShellCommand { 14 public class SimpleNettyServerCommand extends AbstractShellCommand {
15 15
16 //FIXME: Replace these with parameters for 16 //FIXME: Replace these with parameters for
17 - @Argument(index = 0, name = "serverIp", description = "Server IP address", 17 + @Argument(index = 0, name = "port", description = "listen port",
18 required = false, multiValued = false) 18 required = false, multiValued = false)
19 - String serverIp = "127.0.0.1"; 19 + String port = "8081";
20 -
21 - @Argument(index = 1, name = "workers", description = "IO workers",
22 - required = false, multiValued = false)
23 - String workers = "6";
24 -
25 - @Argument(index = 2, name = "messageLength", description = "Message length (bytes)",
26 - required = false, multiValued = false)
27 - String messageLength = "128";
28 20
29 @Override 21 @Override
30 protected void execute() { 22 protected void execute() {
31 try { 23 try {
32 - startStandalone(new String[]{serverIp, workers, messageLength}); 24 + startStandalone(new String[]{port});
33 } catch (Exception e) { 25 } catch (Exception e) {
34 error("Unable to start server %s", e); 26 error("Unable to start server %s", e);
35 } 27 }
......
...@@ -16,4 +16,14 @@ ...@@ -16,4 +16,14 @@
16 16
17 <description>ONOS simple Mobility app</description> 17 <description>ONOS simple Mobility app</description>
18 18
19 + <dependencies>
20 + <dependency>
21 + <groupId>com.google.guava</groupId>
22 + <artifactId>guava</artifactId>
23 + </dependency>
24 + <dependency>
25 + <groupId>org.onlab.onos</groupId>
26 + <artifactId>onlab-misc</artifactId>
27 + </dependency>
28 + </dependencies>
19 </project> 29 </project>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
24 <module>mobility</module> 24 <module>mobility</module>
25 <module>proxyarp</module> 25 <module>proxyarp</module>
26 <module>config</module> 26 <module>config</module>
27 + <module>sdnip</module>
27 </modules> 28 </modules>
28 29
29 <properties> 30 <properties>
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5 + <modelVersion>4.0.0</modelVersion>
6 +
7 + <parent>
8 + <groupId>org.onlab.onos</groupId>
9 + <artifactId>onos-apps</artifactId>
10 + <version>1.0.0-SNAPSHOT</version>
11 + <relativePath>../pom.xml</relativePath>
12 + </parent>
13 +
14 + <artifactId>onos-app-sdnip</artifactId>
15 + <packaging>bundle</packaging>
16 +
17 + <description>SDN-IP peering application</description>
18 +
19 + <dependencies>
20 + <dependency>
21 + <groupId>org.codehaus.jackson</groupId>
22 + <artifactId>jackson-core-asl</artifactId>
23 + </dependency>
24 + <dependency>
25 + <groupId>org.codehaus.jackson</groupId>
26 + <artifactId>jackson-mapper-asl</artifactId>
27 + </dependency>
28 + <dependency>
29 + <groupId>com.fasterxml.jackson.core</groupId>
30 + <artifactId>jackson-annotations</artifactId>
31 + <version>2.4.2</version>
32 + <scope>provided</scope>
33 + </dependency>
34 + </dependencies>
35 +
36 +</project>
1 +package org.onlab.onos.sdnip;
2 +
3 +import static org.slf4j.LoggerFactory.getLogger;
4 +
5 +import org.apache.felix.scr.annotations.Activate;
6 +import org.apache.felix.scr.annotations.Component;
7 +import org.apache.felix.scr.annotations.Deactivate;
8 +import org.slf4j.Logger;
9 +
10 +/**
11 + * Placeholder SDN-IP component.
12 + */
13 +@Component(immediate = true)
14 +public class SdnIp {
15 +
16 + private final Logger log = getLogger(getClass());
17 +
18 + @Activate
19 + protected void activate() {
20 + log.debug("SDN-IP started");
21 + }
22 +
23 + @Deactivate
24 + protected void deactivate() {
25 + log.info("Stopped");
26 + }
27 +}
1 +/**
2 + * SDN-IP peering application.
3 + */
4 +package org.onlab.onos.sdnip;
...\ No newline at end of file ...\ No newline at end of file
1 -package org.onlab.onos.store.common.impl; 1 +package org.onlab.onos.cluster;
2 -
3 -import org.onlab.onos.cluster.ControllerNode;
4 -import org.onlab.onos.cluster.NodeId;
5 2
6 import com.google.common.base.Function; 3 import com.google.common.base.Function;
7 4
...@@ -18,6 +15,11 @@ public final class ControllerNodeToNodeId ...@@ -18,6 +15,11 @@ public final class ControllerNodeToNodeId
18 return input.id(); 15 return input.id();
19 } 16 }
20 17
18 + /**
19 + * Returns a Function to convert ControllerNode to NodeId.
20 + *
21 + * @return ControllerNodeToNodeId instance.
22 + */
21 public static ControllerNodeToNodeId toNodeId() { 23 public static ControllerNodeToNodeId toNodeId() {
22 return INSTANCE; 24 return INSTANCE;
23 } 25 }
......
1 +package org.onlab.onos.cluster;
2 +
3 +import static org.junit.Assert.*;
4 +import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
5 +
6 +import java.util.Arrays;
7 +import java.util.List;
8 +
9 +import org.junit.Test;
10 +import org.onlab.packet.IpPrefix;
11 +
12 +import com.google.common.collect.FluentIterable;
13 +
14 +
15 +public class ControllerNodeToNodeIdTest {
16 +
17 + private static final NodeId NID1 = new NodeId("foo");
18 + private static final NodeId NID2 = new NodeId("bar");
19 + private static final NodeId NID3 = new NodeId("buz");
20 +
21 + private static final IpPrefix IP1 = IpPrefix.valueOf("127.0.0.1");
22 + private static final IpPrefix IP2 = IpPrefix.valueOf("127.0.0.2");
23 + private static final IpPrefix IP3 = IpPrefix.valueOf("127.0.0.3");
24 +
25 + private static final ControllerNode CN1 = new DefaultControllerNode(NID1, IP1);
26 + private static final ControllerNode CN2 = new DefaultControllerNode(NID2, IP2);
27 + private static final ControllerNode CN3 = new DefaultControllerNode(NID3, IP3);
28 +
29 +
30 + @Test
31 + public final void testToNodeId() {
32 +
33 + final Iterable<ControllerNode> nodes = Arrays.asList(CN1, CN2, CN3);
34 + final List<NodeId> nodeIds = Arrays.asList(NID1, NID2, NID3);
35 +
36 + assertEquals(nodeIds,
37 + FluentIterable.from(nodes)
38 + .transform(toNodeId())
39 + .toList());
40 + }
41 +
42 +}
...@@ -9,6 +9,7 @@ import static org.onlab.onos.event.TestEvent.Type.FOO; ...@@ -9,6 +9,7 @@ import static org.onlab.onos.event.TestEvent.Type.FOO;
9 import java.util.List; 9 import java.util.List;
10 import java.util.Timer; 10 import java.util.Timer;
11 11
12 +import org.junit.Ignore;
12 import org.junit.Test; 13 import org.junit.Test;
13 14
14 /** 15 /**
...@@ -41,6 +42,7 @@ public class AbstractEventAccumulatorTest { ...@@ -41,6 +42,7 @@ public class AbstractEventAccumulatorTest {
41 assertEquals("incorrect batch", "abcde", accumulator.batch); 42 assertEquals("incorrect batch", "abcde", accumulator.batch);
42 } 43 }
43 44
45 + @Ignore("FIXME: timing sensitive test failing randomly.")
44 @Test 46 @Test
45 public void timeTrigger() { 47 public void timeTrigger() {
46 TestAccumulator accumulator = new TestAccumulator(); 48 TestAccumulator accumulator = new TestAccumulator();
......
...@@ -54,8 +54,13 @@ ...@@ -54,8 +54,13 @@
54 <artifactId>org.apache.felix.scr.annotations</artifactId> 54 <artifactId>org.apache.felix.scr.annotations</artifactId>
55 </dependency> 55 </dependency>
56 <dependency> 56 <dependency>
57 - <groupId>de.javakaffee</groupId> 57 + <groupId>com.google.guava</groupId>
58 - <artifactId>kryo-serializers</artifactId> 58 + <artifactId>guava-testlib</artifactId>
59 + <scope>test</scope>
60 + </dependency>
61 + <dependency>
62 + <groupId>org.apache.commons</groupId>
63 + <artifactId>commons-lang3</artifactId>
59 </dependency> 64 </dependency>
60 </dependencies> 65 </dependencies>
61 66
......
...@@ -65,6 +65,7 @@ import java.util.concurrent.TimeUnit; ...@@ -65,6 +65,7 @@ import java.util.concurrent.TimeUnit;
65 65
66 import static com.google.common.base.Preconditions.checkArgument; 66 import static com.google.common.base.Preconditions.checkArgument;
67 import static com.google.common.base.Predicates.notNull; 67 import static com.google.common.base.Predicates.notNull;
68 +import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
68 import static org.onlab.onos.net.device.DeviceEvent.Type.*; 69 import static org.onlab.onos.net.device.DeviceEvent.Type.*;
69 import static org.slf4j.LoggerFactory.getLogger; 70 import static org.slf4j.LoggerFactory.getLogger;
70 import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked; 71 import static org.apache.commons.lang3.concurrent.ConcurrentUtils.createIfAbsentUnchecked;
...@@ -73,7 +74,6 @@ import static com.google.common.base.Verify.verify; ...@@ -73,7 +74,6 @@ import static com.google.common.base.Verify.verify;
73 import static org.onlab.util.Tools.namedThreads; 74 import static org.onlab.util.Tools.namedThreads;
74 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; 75 import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
75 import static org.onlab.onos.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_ADVERTISE; 76 import static org.onlab.onos.store.device.impl.GossipDeviceStoreMessageSubjects.DEVICE_ADVERTISE;
76 -import static org.onlab.onos.store.common.impl.ControllerNodeToNodeId.toNodeId;
77 77
78 // TODO: give me a better name 78 // TODO: give me a better name
79 /** 79 /**
......
1 +package org.onlab.onos.store.link.impl;
2 +
3 +import org.onlab.onos.store.cluster.messaging.MessageSubject;
4 +
5 +/**
6 + * MessageSubjects used by GossipLinkStore peer-peer communication.
7 + */
8 +public final class GossipLinkStoreMessageSubjects {
9 +
10 + private GossipLinkStoreMessageSubjects() {}
11 +
12 + public static final MessageSubject LINK_UPDATE =
13 + new MessageSubject("peer-link-update");
14 + public static final MessageSubject LINK_REMOVED =
15 + new MessageSubject("peer-link-removed");
16 + public static final MessageSubject LINK_ANTI_ENTROPY_ADVERTISEMENT =
17 + new MessageSubject("link-enti-entropy-advertisement");
18 +}
1 +package org.onlab.onos.store.link.impl;
2 +
3 +import com.google.common.base.MoreObjects;
4 +
5 +import org.onlab.onos.net.link.LinkDescription;
6 +import org.onlab.onos.net.provider.ProviderId;
7 +import org.onlab.onos.store.common.impl.Timestamped;
8 +
9 +/**
10 + * Information published by GossipDeviceStore to notify peers of a device
11 + * change event.
12 + */
13 +public class InternalLinkEvent {
14 +
15 + private final ProviderId providerId;
16 + private final Timestamped<LinkDescription> linkDescription;
17 +
18 + protected InternalLinkEvent(
19 + ProviderId providerId,
20 + Timestamped<LinkDescription> linkDescription) {
21 + this.providerId = providerId;
22 + this.linkDescription = linkDescription;
23 + }
24 +
25 + public ProviderId providerId() {
26 + return providerId;
27 + }
28 +
29 + public Timestamped<LinkDescription> linkDescription() {
30 + return linkDescription;
31 + }
32 +
33 + @Override
34 + public String toString() {
35 + return MoreObjects.toStringHelper(getClass())
36 + .add("providerId", providerId)
37 + .add("linkDescription", linkDescription)
38 + .toString();
39 + }
40 +
41 + // for serializer
42 + protected InternalLinkEvent() {
43 + this.providerId = null;
44 + this.linkDescription = null;
45 + }
46 +}
1 +package org.onlab.onos.store.link.impl;
2 +
3 +import org.onlab.onos.net.LinkKey;
4 +import org.onlab.onos.store.Timestamp;
5 +
6 +import com.google.common.base.MoreObjects;
7 +
8 +/**
9 + * Information published by GossipLinkStore to notify peers of a link
10 + * being removed.
11 + */
12 +public class InternalLinkRemovedEvent {
13 +
14 + private final LinkKey linkKey;
15 + private final Timestamp timestamp;
16 +
17 + /**
18 + * Creates a InternalLinkRemovedEvent.
19 + * @param linkKey identifier of the removed link.
20 + * @param timestamp timestamp of when the link was removed.
21 + */
22 + public InternalLinkRemovedEvent(LinkKey linkKey, Timestamp timestamp) {
23 + this.linkKey = linkKey;
24 + this.timestamp = timestamp;
25 + }
26 +
27 + public LinkKey linkKey() {
28 + return linkKey;
29 + }
30 +
31 + public Timestamp timestamp() {
32 + return timestamp;
33 + }
34 +
35 + @Override
36 + public String toString() {
37 + return MoreObjects.toStringHelper(getClass())
38 + .add("linkKey", linkKey)
39 + .add("timestamp", timestamp)
40 + .toString();
41 + }
42 +
43 + // for serializer
44 + @SuppressWarnings("unused")
45 + private InternalLinkRemovedEvent() {
46 + linkKey = null;
47 + timestamp = null;
48 + }
49 +}
...\ No newline at end of file ...\ No newline at end of file
1 +package org.onlab.onos.store.link.impl;
2 +
3 +import static com.google.common.base.Preconditions.checkNotNull;
4 +
5 +import java.util.Map;
6 +
7 +import org.onlab.onos.cluster.NodeId;
8 +import org.onlab.onos.net.LinkKey;
9 +import org.onlab.onos.store.Timestamp;
10 +
11 +/**
12 + * Link AE Advertisement message.
13 + */
14 +public class LinkAntiEntropyAdvertisement {
15 +
16 + private final NodeId sender;
17 + private final Map<LinkFragmentId, Timestamp> linkTimestamps;
18 + private final Map<LinkKey, Timestamp> linkTombstones;
19 +
20 +
21 + public LinkAntiEntropyAdvertisement(NodeId sender,
22 + Map<LinkFragmentId, Timestamp> linkTimestamps,
23 + Map<LinkKey, Timestamp> linkTombstones) {
24 + this.sender = checkNotNull(sender);
25 + this.linkTimestamps = checkNotNull(linkTimestamps);
26 + this.linkTombstones = checkNotNull(linkTombstones);
27 + }
28 +
29 + public NodeId sender() {
30 + return sender;
31 + }
32 +
33 + public Map<LinkFragmentId, Timestamp> linkTimestamps() {
34 + return linkTimestamps;
35 + }
36 +
37 + public Map<LinkKey, Timestamp> linkTombstones() {
38 + return linkTombstones;
39 + }
40 +
41 + // For serializer
42 + @SuppressWarnings("unused")
43 + private LinkAntiEntropyAdvertisement() {
44 + this.sender = null;
45 + this.linkTimestamps = null;
46 + this.linkTombstones = null;
47 + }
48 +}
1 +package org.onlab.onos.store.link.impl;
2 +
3 +import java.util.Objects;
4 +
5 +import org.onlab.onos.net.LinkKey;
6 +import org.onlab.onos.net.provider.ProviderId;
7 +
8 +import com.google.common.base.MoreObjects;
9 +
10 +/**
11 + * Identifier for LinkDescription from a Provider.
12 + */
13 +public final class LinkFragmentId {
14 + public final ProviderId providerId;
15 + public final LinkKey linkKey;
16 +
17 + public LinkFragmentId(LinkKey linkKey, ProviderId providerId) {
18 + this.providerId = providerId;
19 + this.linkKey = linkKey;
20 + }
21 +
22 + public LinkKey linkKey() {
23 + return linkKey;
24 + }
25 +
26 + public ProviderId providerId() {
27 + return providerId;
28 + }
29 +
30 + @Override
31 + public int hashCode() {
32 + return Objects.hash(providerId, linkKey);
33 + }
34 +
35 + @Override
36 + public boolean equals(Object obj) {
37 + if (this == obj) {
38 + return true;
39 + }
40 + if (!(obj instanceof LinkFragmentId)) {
41 + return false;
42 + }
43 + LinkFragmentId that = (LinkFragmentId) obj;
44 + return Objects.equals(this.linkKey, that.linkKey) &&
45 + Objects.equals(this.providerId, that.providerId);
46 + }
47 +
48 + @Override
49 + public String toString() {
50 + return MoreObjects.toStringHelper(getClass())
51 + .add("providerId", providerId)
52 + .add("linkKey", linkKey)
53 + .toString();
54 + }
55 +
56 + // for serializer
57 + @SuppressWarnings("unused")
58 + private LinkFragmentId() {
59 + this.providerId = null;
60 + this.linkKey = null;
61 + }
62 +}
1 -package org.onlab.onos.store.link.impl;
2 -
3 -import static org.onlab.onos.net.Link.Type.DIRECT;
4 -import static org.onlab.onos.net.Link.Type.INDIRECT;
5 -import static org.onlab.onos.net.link.LinkEvent.Type.LINK_ADDED;
6 -import static org.onlab.onos.net.link.LinkEvent.Type.LINK_REMOVED;
7 -import static org.onlab.onos.net.link.LinkEvent.Type.LINK_UPDATED;
8 -import static org.slf4j.LoggerFactory.getLogger;
9 -
10 -import java.util.HashSet;
11 -import java.util.Set;
12 -import java.util.concurrent.ConcurrentHashMap;
13 -import java.util.concurrent.ConcurrentMap;
14 -
15 -import org.apache.felix.scr.annotations.Activate;
16 -import org.apache.felix.scr.annotations.Component;
17 -import org.apache.felix.scr.annotations.Deactivate;
18 -import org.apache.felix.scr.annotations.Reference;
19 -import org.apache.felix.scr.annotations.ReferenceCardinality;
20 -import org.apache.felix.scr.annotations.Service;
21 -import org.onlab.onos.net.ConnectPoint;
22 -import org.onlab.onos.net.DefaultLink;
23 -import org.onlab.onos.net.DeviceId;
24 -import org.onlab.onos.net.Link;
25 -import org.onlab.onos.net.LinkKey;
26 -import org.onlab.onos.net.link.LinkDescription;
27 -import org.onlab.onos.net.link.LinkEvent;
28 -import org.onlab.onos.net.link.LinkStore;
29 -import org.onlab.onos.net.link.LinkStoreDelegate;
30 -import org.onlab.onos.net.provider.ProviderId;
31 -import org.onlab.onos.store.AbstractStore;
32 -import org.onlab.onos.store.ClockService;
33 -import org.onlab.onos.store.Timestamp;
34 -import org.slf4j.Logger;
35 -
36 -import com.google.common.collect.HashMultimap;
37 -import com.google.common.collect.ImmutableSet;
38 -import com.google.common.collect.Multimap;
39 -import com.google.common.collect.ImmutableSet.Builder;
40 -
41 -import static com.google.common.base.Preconditions.checkArgument;
42 -import static com.google.common.base.Preconditions.checkState;
43 -
44 -//TODO: Add support for multiple provider and annotations
45 -/**
46 - * Manages inventory of infrastructure links using a protocol that takes into consideration
47 - * the order in which events occur.
48 - */
49 -// FIXME: This does not yet implement the full protocol.
50 -// The full protocol requires the sender of LLDP message to include the
51 -// version information of src device/port and the receiver to
52 -// take that into account when figuring out if a more recent src
53 -// device/port down event renders the link discovery obsolete.
54 -@Component(immediate = true)
55 -@Service
56 -public class OnosDistributedLinkStore
57 - extends AbstractStore<LinkEvent, LinkStoreDelegate>
58 - implements LinkStore {
59 -
60 - private final Logger log = getLogger(getClass());
61 -
62 - // Link inventory
63 - private ConcurrentMap<LinkKey, VersionedValue<Link>> links;
64 -
65 - public static final String LINK_NOT_FOUND = "Link between %s and %s not found";
66 -
67 - // TODO synchronize?
68 - // Egress and ingress link sets
69 - private final Multimap<DeviceId, VersionedValue<Link>> srcLinks = HashMultimap.create();
70 - private final Multimap<DeviceId, VersionedValue<Link>> dstLinks = HashMultimap.create();
71 -
72 - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
73 - protected ClockService clockService;
74 -
75 - @Activate
76 - public void activate() {
77 -
78 - links = new ConcurrentHashMap<>();
79 -
80 - log.info("Started");
81 - }
82 -
83 - @Deactivate
84 - public void deactivate() {
85 - log.info("Stopped");
86 - }
87 -
88 - @Override
89 - public int getLinkCount() {
90 - return links.size();
91 - }
92 -
93 - @Override
94 - public Iterable<Link> getLinks() {
95 - Builder<Link> builder = ImmutableSet.builder();
96 - synchronized (this) {
97 - for (VersionedValue<Link> link : links.values()) {
98 - builder.add(link.entity());
99 - }
100 - return builder.build();
101 - }
102 - }
103 -
104 - @Override
105 - public Set<Link> getDeviceEgressLinks(DeviceId deviceId) {
106 - Set<VersionedValue<Link>> egressLinks = ImmutableSet.copyOf(srcLinks.get(deviceId));
107 - Set<Link> rawEgressLinks = new HashSet<>();
108 - for (VersionedValue<Link> link : egressLinks) {
109 - rawEgressLinks.add(link.entity());
110 - }
111 - return rawEgressLinks;
112 - }
113 -
114 - @Override
115 - public Set<Link> getDeviceIngressLinks(DeviceId deviceId) {
116 - Set<VersionedValue<Link>> ingressLinks = ImmutableSet.copyOf(dstLinks.get(deviceId));
117 - Set<Link> rawIngressLinks = new HashSet<>();
118 - for (VersionedValue<Link> link : ingressLinks) {
119 - rawIngressLinks.add(link.entity());
120 - }
121 - return rawIngressLinks;
122 - }
123 -
124 - @Override
125 - public Link getLink(ConnectPoint src, ConnectPoint dst) {
126 - VersionedValue<Link> link = links.get(new LinkKey(src, dst));
127 - checkArgument(link != null, "LINK_NOT_FOUND", src, dst);
128 - return link.entity();
129 - }
130 -
131 - @Override
132 - public Set<Link> getEgressLinks(ConnectPoint src) {
133 - Set<Link> egressLinks = new HashSet<>();
134 - for (VersionedValue<Link> link : srcLinks.get(src.deviceId())) {
135 - if (link.entity().src().equals(src)) {
136 - egressLinks.add(link.entity());
137 - }
138 - }
139 - return egressLinks;
140 - }
141 -
142 - @Override
143 - public Set<Link> getIngressLinks(ConnectPoint dst) {
144 - Set<Link> ingressLinks = new HashSet<>();
145 - for (VersionedValue<Link> link : dstLinks.get(dst.deviceId())) {
146 - if (link.entity().dst().equals(dst)) {
147 - ingressLinks.add(link.entity());
148 - }
149 - }
150 - return ingressLinks;
151 - }
152 -
153 - @Override
154 - public LinkEvent createOrUpdateLink(ProviderId providerId,
155 - LinkDescription linkDescription) {
156 -
157 - final DeviceId destinationDeviceId = linkDescription.dst().deviceId();
158 - final Timestamp newTimestamp = clockService.getTimestamp(destinationDeviceId);
159 -
160 - LinkKey key = new LinkKey(linkDescription.src(), linkDescription.dst());
161 - VersionedValue<Link> link = links.get(key);
162 - if (link == null) {
163 - return createLink(providerId, key, linkDescription, newTimestamp);
164 - }
165 -
166 - checkState(newTimestamp.compareTo(link.timestamp()) > 0,
167 - "Existing Link has a timestamp in the future!");
168 -
169 - return updateLink(providerId, link, key, linkDescription, newTimestamp);
170 - }
171 -
172 - // Creates and stores the link and returns the appropriate event.
173 - private LinkEvent createLink(ProviderId providerId, LinkKey key,
174 - LinkDescription linkDescription, Timestamp timestamp) {
175 - VersionedValue<Link> link = new VersionedValue<Link>(new DefaultLink(providerId, key.src(), key.dst(),
176 - linkDescription.type()), true, timestamp);
177 - synchronized (this) {
178 - links.put(key, link);
179 - addNewLink(link, timestamp);
180 - }
181 - // FIXME: notify peers.
182 - return new LinkEvent(LINK_ADDED, link.entity());
183 - }
184 -
185 - // update Egress and ingress link sets
186 - private void addNewLink(VersionedValue<Link> link, Timestamp timestamp) {
187 - Link rawLink = link.entity();
188 - synchronized (this) {
189 - srcLinks.put(rawLink.src().deviceId(), link);
190 - dstLinks.put(rawLink.dst().deviceId(), link);
191 - }
192 - }
193 -
194 - // Updates, if necessary the specified link and returns the appropriate event.
195 - private LinkEvent updateLink(ProviderId providerId, VersionedValue<Link> existingLink,
196 - LinkKey key, LinkDescription linkDescription, Timestamp timestamp) {
197 - // FIXME confirm Link update condition is OK
198 - if (existingLink.entity().type() == INDIRECT && linkDescription.type() == DIRECT) {
199 - synchronized (this) {
200 -
201 - VersionedValue<Link> updatedLink = new VersionedValue<Link>(
202 - new DefaultLink(providerId, existingLink.entity().src(), existingLink.entity().dst(),
203 - linkDescription.type()), true, timestamp);
204 - links.replace(key, existingLink, updatedLink);
205 -
206 - replaceLink(existingLink, updatedLink);
207 - // FIXME: notify peers.
208 - return new LinkEvent(LINK_UPDATED, updatedLink.entity());
209 - }
210 - }
211 - return null;
212 - }
213 -
214 - // update Egress and ingress link sets
215 - private void replaceLink(VersionedValue<Link> current, VersionedValue<Link> updated) {
216 - synchronized (this) {
217 - srcLinks.remove(current.entity().src().deviceId(), current);
218 - dstLinks.remove(current.entity().dst().deviceId(), current);
219 -
220 - srcLinks.put(current.entity().src().deviceId(), updated);
221 - dstLinks.put(current.entity().dst().deviceId(), updated);
222 - }
223 - }
224 -
225 - @Override
226 - public LinkEvent removeLink(ConnectPoint src, ConnectPoint dst) {
227 - synchronized (this) {
228 - LinkKey key = new LinkKey(src, dst);
229 - VersionedValue<Link> link = links.remove(key);
230 - if (link != null) {
231 - removeLink(link);
232 - // notify peers
233 - return new LinkEvent(LINK_REMOVED, link.entity());
234 - }
235 - return null;
236 - }
237 - }
238 -
239 - // update Egress and ingress link sets
240 - private void removeLink(VersionedValue<Link> link) {
241 - synchronized (this) {
242 - srcLinks.remove(link.entity().src().deviceId(), link);
243 - dstLinks.remove(link.entity().dst().deviceId(), link);
244 - }
245 - }
246 -}
1 -package org.onlab.onos.store.link.impl;
2 -
3 -import java.util.Objects;
4 -
5 -import org.onlab.onos.store.Timestamp;
6 -
7 -// TODO: remove once we stop using this
8 -/**
9 - * Wrapper class for a entity that is versioned
10 - * and can either be up or down.
11 - *
12 - * @param <T> type of the value.
13 - */
14 -public class VersionedValue<T> {
15 - private final T entity;
16 - private final Timestamp timestamp;
17 - private final boolean isUp;
18 -
19 - public VersionedValue(T entity, boolean isUp, Timestamp timestamp) {
20 - this.entity = entity;
21 - this.isUp = isUp;
22 - this.timestamp = timestamp;
23 - }
24 -
25 - /**
26 - * Returns the value.
27 - * @return value.
28 - */
29 - public T entity() {
30 - return entity;
31 - }
32 -
33 - /**
34 - * Tells whether the entity is up or down.
35 - * @return true if up, false otherwise.
36 - */
37 - public boolean isUp() {
38 - return isUp;
39 - }
40 -
41 - /**
42 - * Returns the timestamp (version) associated with this entity.
43 - * @return timestamp.
44 - */
45 - public Timestamp timestamp() {
46 - return timestamp;
47 - }
48 -
49 -
50 - @Override
51 - public int hashCode() {
52 - return Objects.hash(entity, timestamp, isUp);
53 - }
54 -
55 - @Override
56 - public boolean equals(Object obj) {
57 - if (this == obj) {
58 - return true;
59 - }
60 - if (obj == null) {
61 - return false;
62 - }
63 - if (getClass() != obj.getClass()) {
64 - return false;
65 - }
66 - @SuppressWarnings("unchecked")
67 - VersionedValue<T> that = (VersionedValue<T>) obj;
68 - return Objects.equals(this.entity, that.entity) &&
69 - Objects.equals(this.timestamp, that.timestamp) &&
70 - Objects.equals(this.isUp, that.isUp);
71 - }
72 -
73 - // Default constructor for serializer
74 - protected VersionedValue() {
75 - this.entity = null;
76 - this.isUp = false;
77 - this.timestamp = null;
78 - }
79 -}
1 +package org.onlab.onos.store.device.impl.peermsg;
2 +
3 +import static org.onlab.onos.net.DeviceId.deviceId;
4 +
5 +import org.junit.Test;
6 +import org.onlab.onos.net.DeviceId;
7 +import org.onlab.onos.net.provider.ProviderId;
8 +
9 +import com.google.common.testing.EqualsTester;
10 +
11 +public class DeviceFragmentIdTest {
12 +
13 + private static final ProviderId PID = new ProviderId("of", "foo");
14 + private static final ProviderId PIDA = new ProviderId("of", "bar", true);
15 + private static final DeviceId DID1 = deviceId("of:foo");
16 + private static final DeviceId DID2 = deviceId("of:bar");
17 +
18 + @Test
19 + public final void testEquals() {
20 +
21 + new EqualsTester()
22 + .addEqualityGroup(new DeviceFragmentId(DID1, PID),
23 + new DeviceFragmentId(DID1, PID))
24 + .addEqualityGroup(new DeviceFragmentId(DID2, PID),
25 + new DeviceFragmentId(DID2, PID))
26 + .addEqualityGroup(new DeviceFragmentId(DID1, PIDA),
27 + new DeviceFragmentId(DID1, PIDA))
28 + .addEqualityGroup(new DeviceFragmentId(DID2, PIDA),
29 + new DeviceFragmentId(DID2, PIDA))
30 + .testEquals();
31 + }
32 +
33 +}
1 +package org.onlab.onos.store.device.impl.peermsg;
2 +
3 +import static org.onlab.onos.net.DeviceId.deviceId;
4 +
5 +import org.junit.Test;
6 +import org.onlab.onos.net.DeviceId;
7 +import org.onlab.onos.net.PortNumber;
8 +import org.onlab.onos.net.provider.ProviderId;
9 +
10 +import com.google.common.testing.EqualsTester;
11 +
12 +public class PortFragmentIdTest {
13 +
14 + private static final ProviderId PID = new ProviderId("of", "foo");
15 + private static final ProviderId PIDA = new ProviderId("of", "bar", true);
16 +
17 + private static final DeviceId DID1 = deviceId("of:foo");
18 + private static final DeviceId DID2 = deviceId("of:bar");
19 +
20 + private static final PortNumber PN1 = PortNumber.portNumber(1);
21 + private static final PortNumber PN2 = PortNumber.portNumber(2);
22 +
23 + @Test
24 + public final void testEquals() {
25 + new EqualsTester()
26 + .addEqualityGroup(new PortFragmentId(DID1, PID, PN1),
27 + new PortFragmentId(DID1, PID, PN1))
28 + .addEqualityGroup(new PortFragmentId(DID2, PID, PN1),
29 + new PortFragmentId(DID2, PID, PN1))
30 + .addEqualityGroup(new PortFragmentId(DID1, PIDA, PN1),
31 + new PortFragmentId(DID1, PIDA, PN1))
32 + .addEqualityGroup(new PortFragmentId(DID2, PIDA, PN1),
33 + new PortFragmentId(DID2, PIDA, PN1))
34 +
35 + .addEqualityGroup(new PortFragmentId(DID1, PID, PN2),
36 + new PortFragmentId(DID1, PID, PN2))
37 + .addEqualityGroup(new PortFragmentId(DID2, PID, PN2),
38 + new PortFragmentId(DID2, PID, PN2))
39 + .addEqualityGroup(new PortFragmentId(DID1, PIDA, PN2),
40 + new PortFragmentId(DID1, PIDA, PN2))
41 + .addEqualityGroup(new PortFragmentId(DID2, PIDA, PN2),
42 + new PortFragmentId(DID2, PIDA, PN2))
43 + .testEquals();
44 + }
45 +
46 +}
...@@ -46,10 +46,6 @@ ...@@ -46,10 +46,6 @@
46 <groupId>com.hazelcast</groupId> 46 <groupId>com.hazelcast</groupId>
47 <artifactId>hazelcast</artifactId> 47 <artifactId>hazelcast</artifactId>
48 </dependency> 48 </dependency>
49 - <dependency>
50 - <groupId>de.javakaffee</groupId>
51 - <artifactId>kryo-serializers</artifactId>
52 - </dependency>
53 </dependencies> 49 </dependencies>
54 50
55 <build> 51 <build>
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
35 <artifactId>hazelcast</artifactId> 35 <artifactId>hazelcast</artifactId>
36 </dependency> 36 </dependency>
37 <dependency> 37 <dependency>
38 - <groupId>de.javakaffee</groupId> 38 + <groupId>org.apache.commons</groupId>
39 - <artifactId>kryo-serializers</artifactId> 39 + <artifactId>commons-lang3</artifactId>
40 </dependency> 40 </dependency>
41 </dependencies> 41 </dependencies>
42 42
......
...@@ -23,11 +23,6 @@ ...@@ -23,11 +23,6 @@
23 </dependency> 23 </dependency>
24 <dependency> 24 <dependency>
25 <groupId>org.onlab.onos</groupId> 25 <groupId>org.onlab.onos</groupId>
26 - <artifactId>onos-core-serializers</artifactId>
27 - <version>${project.version}</version>
28 - </dependency>
29 - <dependency>
30 - <groupId>org.onlab.onos</groupId>
31 <artifactId>onos-core-hz-common</artifactId> 26 <artifactId>onos-core-hz-common</artifactId>
32 <version>${project.version}</version> 27 <version>${project.version}</version>
33 </dependency> 28 </dependency>
...@@ -46,10 +41,6 @@ ...@@ -46,10 +41,6 @@
46 <groupId>com.hazelcast</groupId> 41 <groupId>com.hazelcast</groupId>
47 <artifactId>hazelcast</artifactId> 42 <artifactId>hazelcast</artifactId>
48 </dependency> 43 </dependency>
49 - <dependency>
50 - <groupId>de.javakaffee</groupId>
51 - <artifactId>kryo-serializers</artifactId>
52 - </dependency>
53 </dependencies> 44 </dependencies>
54 45
55 <build> 46 <build>
......
...@@ -26,8 +26,13 @@ ...@@ -26,8 +26,13 @@
26 <artifactId>org.apache.felix.scr.annotations</artifactId> 26 <artifactId>org.apache.felix.scr.annotations</artifactId>
27 </dependency> 27 </dependency>
28 <dependency> 28 <dependency>
29 - <groupId>de.javakaffee</groupId> 29 + <groupId>com.esotericsoftware</groupId>
30 - <artifactId>kryo-serializers</artifactId> 30 + <artifactId>kryo</artifactId>
31 + </dependency>
32 + <dependency>
33 + <groupId>com.google.guava</groupId>
34 + <artifactId>guava-testlib</artifactId>
35 + <scope>test</scope>
31 </dependency> 36 </dependency>
32 </dependencies> 37 </dependencies>
33 38
......
...@@ -24,14 +24,13 @@ import org.onlab.onos.net.Port; ...@@ -24,14 +24,13 @@ import org.onlab.onos.net.Port;
24 import org.onlab.onos.net.PortNumber; 24 import org.onlab.onos.net.PortNumber;
25 import org.onlab.onos.net.device.DefaultDeviceDescription; 25 import org.onlab.onos.net.device.DefaultDeviceDescription;
26 import org.onlab.onos.net.device.DefaultPortDescription; 26 import org.onlab.onos.net.device.DefaultPortDescription;
27 +import org.onlab.onos.net.link.DefaultLinkDescription;
27 import org.onlab.onos.net.provider.ProviderId; 28 import org.onlab.onos.net.provider.ProviderId;
28 import org.onlab.onos.store.Timestamp; 29 import org.onlab.onos.store.Timestamp;
29 import org.onlab.packet.IpAddress; 30 import org.onlab.packet.IpAddress;
30 import org.onlab.packet.IpPrefix; 31 import org.onlab.packet.IpPrefix;
31 import org.onlab.util.KryoPool; 32 import org.onlab.util.KryoPool;
32 33
33 -import de.javakaffee.kryoserializers.URISerializer;
34 -
35 public final class KryoPoolUtil { 34 public final class KryoPoolUtil {
36 35
37 /** 36 /**
...@@ -60,6 +59,7 @@ public final class KryoPoolUtil { ...@@ -60,6 +59,7 @@ public final class KryoPoolUtil {
60 DefaultControllerNode.class, 59 DefaultControllerNode.class,
61 DefaultDevice.class, 60 DefaultDevice.class,
62 DefaultDeviceDescription.class, 61 DefaultDeviceDescription.class,
62 + DefaultLinkDescription.class,
63 MastershipRole.class, 63 MastershipRole.class,
64 Port.class, 64 Port.class,
65 DefaultPortDescription.class, 65 DefaultPortDescription.class,
......
1 +package org.onlab.onos.store.serializers;
2 +
3 +import java.net.URI;
4 +
5 +import com.esotericsoftware.kryo.Kryo;
6 +import com.esotericsoftware.kryo.Serializer;
7 +import com.esotericsoftware.kryo.io.Input;
8 +import com.esotericsoftware.kryo.io.Output;
9 +
10 +/**
11 + * Serializer for {@link URI}.
12 + */
13 +public class URISerializer extends Serializer<URI> {
14 +
15 + /**
16 + * Creates {@link URI} serializer instance.
17 + */
18 + public URISerializer() {
19 + super(false);
20 + }
21 +
22 + @Override
23 + public void write(Kryo kryo, Output output, URI object) {
24 + output.writeString(object.toString());
25 + }
26 +
27 + @Override
28 + public URI read(Kryo kryo, Input input, Class<URI> type) {
29 + return URI.create(input.readString());
30 + }
31 +}
...@@ -20,10 +20,11 @@ ...@@ -20,10 +20,11 @@
20 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle> 20 <bundle>mvn:io.dropwizard.metrics/metrics-core/3.1.0</bundle>
21 <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle> 21 <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.1</bundle>
22 22
23 - <bundle>mvn:com.esotericsoftware.kryo/kryo/2.24.0</bundle> 23 + <bundle>mvn:com.esotericsoftware/kryo/3.0.0</bundle>
24 + <bundle>mvn:com.esotericsoftware/reflectasm/1.10.0</bundle>
25 + <bundle>mvn:org.ow2.asm/asm/4.2</bundle>
24 <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle> 26 <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
25 <bundle>mvn:org.objenesis/objenesis/2.1</bundle> 27 <bundle>mvn:org.objenesis/objenesis/2.1</bundle>
26 - <bundle>mvn:de.javakaffee/kryo-serializers/0.27</bundle>
27 28
28 <bundle>mvn:org.onlab.onos/onlab-nio/1.0.0-SNAPSHOT</bundle> 29 <bundle>mvn:org.onlab.onos/onlab-nio/1.0.0-SNAPSHOT</bundle>
29 30
......
...@@ -193,9 +193,20 @@ ...@@ -193,9 +193,20 @@
193 <version>0.9.1</version> 193 <version>0.9.1</version>
194 </dependency> 194 </dependency>
195 <dependency> 195 <dependency>
196 - <groupId>com.esotericsoftware.kryo</groupId> 196 + <groupId>com.esotericsoftware</groupId>
197 <artifactId>kryo</artifactId> 197 <artifactId>kryo</artifactId>
198 - <version>2.24.0</version> 198 + <version>3.0.0</version>
199 + </dependency>
200 + <dependency>
201 + <groupId>com.esotericsoftware</groupId>
202 + <artifactId>reflectasm</artifactId>
203 + <version>1.10.0</version>
204 + <type>bundle</type>
205 + </dependency>
206 + <dependency>
207 + <groupId>org.ow2.asm</groupId>
208 + <artifactId>asm</artifactId>
209 + <version>4.2</version>
199 </dependency> 210 </dependency>
200 <dependency> 211 <dependency>
201 <groupId>com.esotericsoftware</groupId> 212 <groupId>com.esotericsoftware</groupId>
...@@ -207,11 +218,6 @@ ...@@ -207,11 +218,6 @@
207 <artifactId>objenesis</artifactId> 218 <artifactId>objenesis</artifactId>
208 <version>2.1</version> 219 <version>2.1</version>
209 </dependency> 220 </dependency>
210 - <dependency>
211 - <groupId>de.javakaffee</groupId>
212 - <artifactId>kryo-serializers</artifactId>
213 - <version>0.27</version>
214 - </dependency>
215 221
216 <!-- ONOS related --> 222 <!-- ONOS related -->
217 <dependency> 223 <dependency>
...@@ -284,6 +290,10 @@ ...@@ -284,6 +290,10 @@
284 </dependency> 290 </dependency>
285 <dependency> 291 <dependency>
286 <groupId>org.slf4j</groupId> 292 <groupId>org.slf4j</groupId>
293 + <artifactId>slf4j-api</artifactId>
294 + </dependency>
295 + <dependency>
296 + <groupId>org.slf4j</groupId>
287 <artifactId>slf4j-jdk14</artifactId> 297 <artifactId>slf4j-jdk14</artifactId>
288 </dependency> 298 </dependency>
289 </dependencies> 299 </dependencies>
...@@ -434,9 +444,6 @@ ...@@ -434,9 +444,6 @@
434 <version>3.2</version> 444 <version>3.2</version>
435 <configuration> 445 <configuration>
436 <excludes> 446 <excludes>
437 - <exclude>**/datastore/serializers/**</exclude>
438 - <exclude>**/edu/stanford/**</exclude>
439 - <exclude>**/net/floodlightcontroller/**</exclude>
440 </excludes> 447 </excludes>
441 <rulesets> 448 <rulesets>
442 <ruleset>onos/pmd.xml</ruleset> 449 <ruleset>onos/pmd.xml</ruleset>
...@@ -545,9 +552,6 @@ ...@@ -545,9 +552,6 @@
545 <version>3.2</version> 552 <version>3.2</version>
546 <configuration> 553 <configuration>
547 <excludes> 554 <excludes>
548 - <exclude>**/datastore/serializers/**</exclude>
549 - <exclude>**/edu/stanford/**</exclude>
550 - <exclude>**/net/floodlightcontroller/**</exclude>
551 </excludes> 555 </excludes>
552 <rulesets> 556 <rulesets>
553 <ruleset>onos/pmd.xml</ruleset> 557 <ruleset>onos/pmd.xml</ruleset>
......
1 +#!/bin/bash
1 #------------------------------------------------------------------------------ 2 #------------------------------------------------------------------------------
2 # Echoes project-level directory if a Java file within is newer than the 3 # Echoes project-level directory if a Java file within is newer than the
3 # target directory. 4 # target directory.
......
...@@ -44,16 +44,8 @@ ...@@ -44,16 +44,8 @@
44 <artifactId>minimal-json</artifactId> 44 <artifactId>minimal-json</artifactId>
45 </dependency> 45 </dependency>
46 <dependency> 46 <dependency>
47 - <groupId>com.esotericsoftware.kryo</groupId>
48 - <artifactId>kryo</artifactId>
49 - </dependency>
50 - <dependency>
51 <groupId>com.esotericsoftware</groupId> 47 <groupId>com.esotericsoftware</groupId>
52 - <artifactId>minlog</artifactId> 48 + <artifactId>kryo</artifactId>
53 - </dependency>
54 - <dependency>
55 - <groupId>org.objenesis</groupId>
56 - <artifactId>objenesis</artifactId>
57 </dependency> 49 </dependency>
58 <dependency> 50 <dependency>
59 <groupId>io.dropwizard.metrics</groupId> 51 <groupId>io.dropwizard.metrics</groupId>
......
...@@ -32,10 +32,6 @@ ...@@ -32,10 +32,6 @@
32 <scope>test</scope> 32 <scope>test</scope>
33 </dependency> 33 </dependency>
34 <dependency> 34 <dependency>
35 - <groupId>de.javakaffee</groupId>
36 - <artifactId>kryo-serializers</artifactId>
37 - </dependency>
38 - <dependency>
39 <groupId>io.netty</groupId> 35 <groupId>io.netty</groupId>
40 <artifactId>netty-all</artifactId> 36 <artifactId>netty-all</artifactId>
41 </dependency> 37 </dependency>
......