X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=bmp%2Fbmp-mock%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fprotocol%2Fbmp%2Fmock%2FBmpMockSession.java;h=eef9ba3020262092024b8e92fa1000f0b48ab98d;hb=66855f3a2ab4b7675345c4bedd0b5f0c5a4f05aa;hp=36d219f32ec63918242d73ebad6f01938bc28042;hpb=108c60f69f75c76bd11aa1c07875ee7b1924ef03;p=bgpcep.git

diff --git a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
index 36d219f32e..eef9ba3020 100644
--- a/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
+++ b/bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.protocol.bmp.mock;
 
 import static org.opendaylight.protocol.util.Ipv4Util.incrementIpv4Address;
@@ -18,27 +17,26 @@ import io.netty.channel.SimpleChannelInboundHandler;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import org.opendaylight.protocol.bmp.api.BmpSession;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev180329.AdjRibInType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.message.rev200120.AdjRibInType;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public final class BmpMockSession extends SimpleChannelInboundHandler<Notification> implements BmpSession {
-
+public final class BmpMockSession extends SimpleChannelInboundHandler<Notification<?>> implements BmpSession {
     private static final Logger LOG = LoggerFactory.getLogger(BmpMockSession.class);
 
-    private static final Ipv4Address NEXT_HOP = new Ipv4Address("1.1.1.1");
+    private static final Ipv4AddressNoZone NEXT_HOP = new Ipv4AddressNoZone("1.1.1.1");
     private static final Ipv4Prefix PREFIX = new Ipv4Prefix("1.1.1.1/32");
-    private static final Ipv4Address PEER_ADDRESS = NEXT_HOP;
+    private static final Ipv4AddressNoZone PEER_ADDRESS = NEXT_HOP;
 
     private final int peersCount;
     private final int prePolicyRoutesCount;
     private final int postPolicyRoutesCount;
 
-    private InetSocketAddress remoteAddress;
-    private Channel channel;
+    private InetSocketAddress remoteAddress = null;
+    private Channel channel = null;
 
     public BmpMockSession(final int peersCount, final int prePolicyRoutesCount, final int postPolicyRoutesCount) {
         this.peersCount = peersCount;
@@ -49,44 +47,44 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
     @Override
     public void close() throws InterruptedException {
         LOG.info("BMP session {} is closed.", BmpMockSession.this.channel);
-        this.channel.close().sync();
+        channel.close().sync();
     }
 
     @Override
     public InetAddress getRemoteAddress() {
-        return this.remoteAddress.getAddress();
+        return remoteAddress.getAddress();
     }
 
     @Override
-    protected void channelRead0(final ChannelHandlerContext ctx, final Notification msg) throws Exception {
+    protected void channelRead0(final ChannelHandlerContext ctx, final Notification<?> msg) throws Exception {
         // nothing to read
     }
 
     @Override
     public void channelActive(final ChannelHandlerContext ctx) {
-        this.channel = ctx.channel();
-        this.channel.closeFuture().addListener((ChannelFutureListener) future ->
+        channel = ctx.channel();
+        channel.closeFuture().addListener((ChannelFutureListener) future ->
                 LOG.info("BMP session {} close.", BmpMockSession.this.channel));
-        LOG.info("BMP session {} successfully established.", this.channel);
-        final InetSocketAddress localAddress = (InetSocketAddress) this.channel.localAddress();
-        this.remoteAddress = (InetSocketAddress) this.channel.remoteAddress();
+        LOG.info("BMP session {} successfully established.", channel);
+        final InetSocketAddress localAddress = (InetSocketAddress) channel.localAddress();
+        remoteAddress = (InetSocketAddress) channel.remoteAddress();
         advertizePeers(localAddress);
     }
 
     private void advertizePeers(final InetSocketAddress localAddress) {
         channel.writeAndFlush(BmpMockUtil.createInitiation());
-        Ipv4Address peerAddress = PEER_ADDRESS;
-        for (int i = 0; i < this.peersCount; i++) {
+        Ipv4AddressNoZone peerAddress = PEER_ADDRESS;
+        for (int i = 0; i < peersCount; i++) {
             channel.writeAndFlush(BmpMockUtil.createPeerUp(peerAddress, localAddress.getAddress()));
             LOG.debug("BMP router {} advertized peer {}", channel.localAddress(), peerAddress);
-            advertizeRoutes(this.prePolicyRoutesCount, AdjRibInType.PrePolicy, channel, peerAddress);
-            advertizeRoutes(this.postPolicyRoutesCount, AdjRibInType.PostPolicy, channel, peerAddress);
+            advertizeRoutes(prePolicyRoutesCount, AdjRibInType.PrePolicy, channel, peerAddress);
+            advertizeRoutes(postPolicyRoutesCount, AdjRibInType.PostPolicy, channel, peerAddress);
             peerAddress = incrementIpv4Address(peerAddress);
         }
     }
 
     private static void advertizeRoutes(final int count, final AdjRibInType type, final Channel channel,
-            final Ipv4Address peerAddress) {
+            final Ipv4AddressNoZone peerAddress) {
         Ipv4Prefix prefix = PREFIX;
         for (int i = 0; i < count; i++) {
             channel.writeAndFlush(BmpMockUtil.createRouteMonitoring(peerAddress, type, prefix));