Bumping netty dependency versions to 4.1.5.Final.
Including test fixes.
Few more places referencing atomix version
Change-Id: I48fb8fa255624a86ae12117845603f7d53f1c29e
diff --git a/protocols/lisp/ctl/BUCK b/protocols/lisp/ctl/BUCK
index 447eeb4..2888a88 100644
--- a/protocols/lisp/ctl/BUCK
+++ b/protocols/lisp/ctl/BUCK
@@ -6,7 +6,8 @@
'//lib:netty-codec',
'//lib:netty-transport',
'//lib:netty-transport-native-epoll',
- '//lib:netty-handler'
+ '//lib:netty-handler',
+ '//lib:netty-resolver',
]
TEST_DEPS = [
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
index ebed442..22e7efe 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelAdapter.java
@@ -19,6 +19,7 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelConfig;
import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelId;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import io.netty.channel.ChannelProgressivePromise;
@@ -34,6 +35,11 @@
*/
public class ChannelAdapter implements Channel {
@Override
+ public ChannelId id() {
+ return null;
+ }
+
+ @Override
public EventLoop eventLoop() {
return null;
}
@@ -89,6 +95,16 @@
}
@Override
+ public long bytesBeforeUnwritable() {
+ return 0;
+ }
+
+ @Override
+ public long bytesBeforeWritable() {
+ return 0;
+ }
+
+ @Override
public Unsafe unsafe() {
return null;
}
@@ -224,6 +240,11 @@
}
@Override
+ public <T> boolean hasAttr(AttributeKey<T> key) {
+ return false;
+ }
+
+ @Override
public int compareTo(Channel o) {
return 0;
}
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
index b76c7e6..f288b1b 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/ChannelHandlerContextAdapter.java
@@ -234,4 +234,9 @@
public <T> Attribute<T> attr(AttributeKey<T> attributeKey) {
return null;
}
+
+ @Override
+ public <T> boolean hasAttr(AttributeKey<T> key) {
+ return false;
+ }
}
diff --git a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
index 24a4602..a019677 100644
--- a/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
+++ b/protocols/lisp/ctl/src/test/java/org/onosproject/lisp/ctl/impl/LispMessageAdapter.java
@@ -45,7 +45,7 @@
@Override
public InetSocketAddress getSender() {
- return null;
+ return new InetSocketAddress(1);
}
@Override