BGPCEP-711: BMP test tool clustering support 61/65261/2
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Tue, 7 Nov 2017 10:28:57 +0000 (11:28 +0100)
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>
Tue, 7 Nov 2017 15:04:48 +0000 (15:04 +0000)
Make test tool able to connect to multiple nodes

Change-Id: Ic0011095140e7a31e598bc475f66713c85ed3038
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
bmp/bmp-mock/pom.xml
bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java
bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockArguments.java
bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockSession.java
bmp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMockUtil.java
bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockArgumentsTest.java
bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockDispatcherTest.java
bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockTest.java
bmp/bmp-mock/src/test/java/org/opendaylight/protocol/bmp/mock/BmpMockUtilTest.java

index d52de681a0763394b8846d768412527c1808f78e..87ec51e0d353d70587630903edaa5763d8758bbd 100644 (file)
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
index c129b1802e635b484f2b3143400c72d93bf29fca..fbd820bd077889d60234deee4b43c03ab41b3965 100644 (file)
@@ -53,18 +53,20 @@ public final class BmpMock {
         final BmpExtensionProviderActivator bmpActivator = new BmpActivator(bgpCtx);
         bmpActivator.start(ctx);
 
-        return new BmpMockDispatcher(ctx.getBmpMessageRegistry(),
-            (channel, sessionListenerFactory) -> new BmpMockSession(arguments.getPeersCount(), arguments.getPrePolicyRoutesCount(), arguments.getPostPolicyRoutesCount()));
+        return new BmpMockDispatcher(ctx.getBmpMessageRegistry(), (channel, sessionListenerFactory) ->
+                new BmpMockSession(arguments.getPeersCount(),
+                        arguments.getPrePolicyRoutesCount(), arguments.getPostPolicyRoutesCount()));
     }
 
     private static void deployClients(final BmpMockDispatcher dispatcher, final BmpMockArguments arguments) {
         final InetSocketAddress localAddress = arguments.getLocalAddress();
-        final InetSocketAddress remoteAddress = arguments.getRemoteAddress();
         InetAddress currentLocal = localAddress.getAddress();
         final int port = localAddress.getPort();
-        for (int i = 0; i < arguments.getRoutersCount(); i++) {
-            dispatcher.createClient(new InetSocketAddress(currentLocal, port), remoteAddress);
-            currentLocal = InetAddresses.increment(currentLocal);
+        for (final InetSocketAddress remoteAddress : arguments.getRemoteAddress()) {
+            for (int i = 0; i < arguments.getRoutersCount(); i++) {
+                dispatcher.createClient(new InetSocketAddress(currentLocal, port), remoteAddress);
+                currentLocal = InetAddresses.increment(currentLocal);
+            }
         }
     }
 
index 005612ce8b49a4b7318981bf63d85ef6c45fea42..37239778b9ad85268f731436e03dbad7d69126dc 100644 (file)
@@ -14,12 +14,17 @@ import ch.qos.logback.classic.Level;
 import com.google.common.net.InetAddresses;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.util.Collections;
+import java.util.List;
 import net.sourceforge.argparse4j.ArgumentParsers;
 import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.Argument;
 import net.sourceforge.argparse4j.inf.ArgumentParser;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
+import net.sourceforge.argparse4j.inf.ArgumentType;
 import net.sourceforge.argparse4j.inf.Namespace;
 import org.opendaylight.protocol.util.ArgumentsInput;
+import org.opendaylight.protocol.util.InetSocketAddressUtil;
 
 public final class BmpMockArguments implements ArgumentsInput {
 
@@ -50,7 +55,7 @@ public final class BmpMockArguments implements ArgumentsInput {
         this.parseArgs = parseArgs;
     }
 
-    public static BmpMockArguments parseArguments(final String[] args) {
+    static BmpMockArguments parseArguments(final String[] args) {
         try {
             final Namespace namespace = ARGUMENT_PARSER.parseArgs(args);
             return new BmpMockArguments(namespace);
@@ -59,27 +64,36 @@ public final class BmpMockArguments implements ArgumentsInput {
         }
     }
 
-    public int getRoutersCount() {
+    private interface ArgumentTypeTool<T> extends ArgumentType<T> {
+        default T convert(final ArgumentParser var1, final Argument var2, final String input)
+                throws ArgumentParserException {
+            return convert(input);
+        }
+
+        T convert(String input) throws ArgumentParserException;
+    }
+
+    int getRoutersCount() {
         return this.parseArgs.getInt(ROUTERS_COUNT_DST);
     }
 
-    public int getPeersCount() {
+    int getPeersCount() {
         return this.parseArgs.getInt(PEERS_COUNT_DST);
     }
 
-    public int getPrePolicyRoutesCount() {
+    int getPrePolicyRoutesCount() {
         return this.parseArgs.getInt(PRE_POLICY_ROUTES_COUNT_DST);
     }
 
-    public int getPostPolicyRoutesCount() {
+    int getPostPolicyRoutesCount() {
         return this.parseArgs.getInt(POST_POLICY_ROUTES_COUNT_DST);
     }
 
-    public InetSocketAddress getLocalAddress() {
+    InetSocketAddress getLocalAddress() {
         return this.parseArgs.get(LOCAL_ADDRESS_DST);
     }
 
-    public InetSocketAddress getRemoteAddress() {
+    List<InetSocketAddress> getRemoteAddress() {
         return this.parseArgs.get(REMOTE_ADDRESS_DST);
     }
 
@@ -88,20 +102,35 @@ public final class BmpMockArguments implements ArgumentsInput {
         return this.parseArgs.get(LOG_LEVEL_DST);
     }
 
-    public boolean isOnPassiveMode() {
+    boolean isOnPassiveMode() {
         return this.parseArgs.get(PASSIVE_MODE_DST);
     }
 
     private static ArgumentParser initializeArgumentParser() {
         final ArgumentParser parser = ArgumentParsers.newArgumentParser(PROGRAM_NAME);
-        parser.addArgument(toArgName(ROUTERS_COUNT_DST)).type(Integer.class).setDefault(1);
-        parser.addArgument(toArgName(PEERS_COUNT_DST)).type(Integer.class).setDefault(0);
-        parser.addArgument(toArgName(PRE_POLICY_ROUTES_COUNT_DST)).type(Integer.class).setDefault(0);
-        parser.addArgument(toArgName(POST_POLICY_ROUTES_COUNT_DST)).type(Integer.class).setDefault(0);
-        parser.addArgument(toArgName(PASSIVE_MODE_DST)).action(Arguments.storeTrue());
-        parser.addArgument(toArgName(LOCAL_ADDRESS_DST)).type((parser13, arg, value) -> getInetSocketAddress(value, DEFAULT_LOCAL_PORT)).setDefault(LOCAL_ADDRESS);
-        parser.addArgument(toArgName(REMOTE_ADDRESS_DST)).type((parser12, arg, value) -> getInetSocketAddress(value, DEFAULT_REMOTE_PORT)).setDefault(REMOTE_ADDRESS);
-        parser.addArgument(toArgName(LOG_LEVEL_DST)).type((parser1, arg, value) -> Level.toLevel(value)).setDefault(Level.INFO);
+        parser.addArgument(toArgName(ROUTERS_COUNT_DST))
+                .type(Integer.class)
+                .setDefault(1);
+        parser.addArgument(toArgName(PEERS_COUNT_DST))
+                .type(Integer.class)
+                .setDefault(0);
+        parser.addArgument(toArgName(PRE_POLICY_ROUTES_COUNT_DST))
+                .type(Integer.class)
+                .setDefault(0);
+        parser.addArgument(toArgName(POST_POLICY_ROUTES_COUNT_DST))
+                .type(Integer.class).setDefault(0);
+        parser.addArgument(toArgName(PASSIVE_MODE_DST))
+                .action(Arguments.storeTrue());
+        parser.addArgument(toArgName(LOCAL_ADDRESS_DST))
+                .type((parser13, arg, value) -> getInetSocketAddress(value, DEFAULT_LOCAL_PORT))
+                .setDefault(LOCAL_ADDRESS);
+        parser.addArgument("-ra", toArgName(REMOTE_ADDRESS_DST))
+                .type((ArgumentTypeTool<List<InetSocketAddress>>) input ->
+                        InetSocketAddressUtil.parseAddresses(input, DEFAULT_REMOTE_PORT))
+                .setDefault(Collections.singletonList(REMOTE_ADDRESS));
+        parser.addArgument(toArgName(LOG_LEVEL_DST))
+                .type((parser1, arg, value) -> Level.toLevel(value))
+                .setDefault(Level.INFO);
         return parser;
     }
 
index f338be57659774fed44c0011cb7e7adfa494b169..0c5bd6b9b1c875d126f3d1b125f30b280ddf3681 100644 (file)
@@ -65,7 +65,8 @@ public final class BmpMockSession extends SimpleChannelInboundHandler<Notificati
     @Override
     public void channelActive(final ChannelHandlerContext ctx) {
         this.channel = ctx.channel();
-        this.channel.closeFuture().addListener((ChannelFutureListener) future -> LOG.info("BMP session {} final successfully established.", BmpMockSession.this.channel));
+        this.channel.closeFuture().addListener((ChannelFutureListener) future ->
+                LOG.info("BMP session {} final successfully established.", BmpMockSession.this.channel));
         LOG.info("BMP session {} successfully established.", this.channel);
         final InetSocketAddress localAddress = (InetSocketAddress) this.channel.localAddress();
         this.remoteAddress = (InetSocketAddress) this.channel.remoteAddress();
index 6ee8c512edd96c033fcad8b0307659c500add372..e2fbeccecff47756095917ccadbee9d34ef55fb3 100755 (executable)
@@ -61,7 +61,7 @@ final class BmpMockUtil {
         throw new UnsupportedOperationException();
     }
 
-    public static InitiationMessage createInitiation() {
+    static InitiationMessage createInitiation() {
         final InitiationMessageBuilder msgBuilder = new InitiationMessageBuilder();
         msgBuilder.setTlvs(
             new TlvsBuilder()
@@ -71,7 +71,7 @@ final class BmpMockUtil {
         return msgBuilder.build();
     }
 
-    public static PeerUpNotification createPeerUp(final Ipv4Address peerIp, final InetAddress localAddress) {
+    static PeerUpNotification createPeerUp(final Ipv4Address peerIp, final InetAddress localAddress) {
         final PeerUpNotificationBuilder msgBuilder = new PeerUpNotificationBuilder();
         msgBuilder.setLocalAddress(new IpAddress(new Ipv4Address(localAddress.getHostAddress())));
         msgBuilder.setLocalPort(PEER_PORT);
@@ -102,7 +102,8 @@ final class BmpMockUtil {
             .build();
     }
 
-    public static RouteMonitoringMessage createRouteMonitoring(final Ipv4Address bgpId, final AdjRibInType ribType, final Ipv4Prefix prefix) {
+    static RouteMonitoringMessage createRouteMonitoring(final Ipv4Address bgpId, final AdjRibInType ribType,
+            final Ipv4Prefix prefix) {
         final RouteMonitoringMessageBuilder routeMonitMsgBuilder = new RouteMonitoringMessageBuilder()
             .setPeerHeader(createPeerHeader(bgpId, ribType))
             .setUpdate(createUpdate(prefix));
@@ -112,7 +113,8 @@ final class BmpMockUtil {
     private static Update createUpdate(final Ipv4Prefix prefix) {
         final UpdateBuilder updateBuilder = new UpdateBuilder()
             .setAttributes(new AttributesBuilder().setOrigin(ORIGIN).setAsPath(AS_PATH).setCNextHop(
-                new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(NEXT_HOP).build()).build()).build())
+                new Ipv4NextHopCaseBuilder().setIpv4NextHop(new Ipv4NextHopBuilder().setGlobal(NEXT_HOP).build())
+                        .build()).build())
             .setNlri(new NlriBuilder().setNlri(Collections.singletonList(prefix)).build());
         return updateBuilder.build();
     }
index acc71343a77533e05826d2d1f400a8ab98b18801..a7ee2806884c7835330571e6f9a37eb588917753 100644 (file)
@@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals;
 
 import ch.qos.logback.classic.Level;
 import java.net.InetSocketAddress;
+import java.util.Collections;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import org.junit.Test;
 
@@ -19,60 +20,63 @@ public class BmpMockArgumentsTest {
 
     @Test
     public void testDefaultArguments() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{});
         assertEquals(1, arguments.getRoutersCount());
         assertEquals(0, arguments.getPeersCount());
         assertEquals(0, arguments.getPrePolicyRoutesCount());
         assertEquals(0, arguments.getPostPolicyRoutesCount());
         assertEquals(Level.INFO, arguments.getLogLevel());
         assertEquals(new InetSocketAddress("127.0.0.1", 0), arguments.getLocalAddress());
-        assertEquals(new InetSocketAddress("127.0.0.1", 12345), arguments.getRemoteAddress());
+        assertEquals(Collections.singletonList(new InetSocketAddress("127.0.0.1", 12345)),
+                arguments.getRemoteAddress());
     }
 
-    @Test(expected=IllegalArgumentException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void testWrongArgument() {
-        BmpMockArguments.parseArguments(new String[] {"--routers_count", "abcd"});
+        BmpMockArguments.parseArguments(new String[]{"--routers_count", "abcd"});
     }
 
     @Test
     public void testGetRoutersCount() throws ArgumentParserException {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--routers_count", "10"});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{"--routers_count", "10"});
         assertEquals(10, arguments.getRoutersCount());
     }
 
     @Test
     public void testGetPeersCount() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--peers_count", "5"});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{"--peers_count", "5"});
         assertEquals(5, arguments.getPeersCount());
     }
 
     @Test
     public void testGetPrePolicyRoutesCount() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--pre_policy_routes", "20"});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{"--pre_policy_routes", "20"});
         assertEquals(20, arguments.getPrePolicyRoutesCount());
     }
 
     @Test
     public void testGetPostPolicyRoutesCount() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--post_policy_routes", "100"});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{"--post_policy_routes", "100"});
         assertEquals(100, arguments.getPostPolicyRoutesCount());
     }
 
     @Test
     public void testGetLocalAddress() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--local_address", "1.2.3.4"});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{"--local_address", "1.2.3.4"});
         assertEquals(new InetSocketAddress("1.2.3.4", 0), arguments.getLocalAddress());
     }
 
     @Test
     public void testGetRemoteAddress() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--remote_address", "4.5.6.7:1025"});
-        assertEquals(new InetSocketAddress("4.5.6.7", 1025), arguments.getRemoteAddress());
+        final BmpMockArguments arguments = BmpMockArguments
+                .parseArguments(new String[]{"--remote_address", "4.5.6.7:1025"});
+        assertEquals(Collections.singletonList(new InetSocketAddress("4.5.6.7", 1025)),
+                arguments.getRemoteAddress());
     }
 
     @Test
     public void testGetLogLevel() {
-        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[] {"--log_level", "TRACE"});
+        final BmpMockArguments arguments = BmpMockArguments.parseArguments(new String[]{"--log_level", "TRACE"});
         assertEquals(Level.TRACE, arguments.getLogLevel());
     }
 
index db336dab4abdb3983aa49bf199fcd30411a99c39..bce3b06a65d4f67ee11b8254fe084689561cd6bc 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.bmp.mock;
 
 import static org.opendaylight.protocol.bmp.mock.BmpMockTest.waitFutureComplete;
 
-import com.google.common.base.Optional;
 import com.google.common.net.InetAddresses;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -23,6 +22,7 @@ import org.opendaylight.protocol.bmp.api.BmpSessionFactory;
 import org.opendaylight.protocol.bmp.api.BmpSessionListenerFactory;
 import org.opendaylight.protocol.bmp.impl.BmpDispatcherImpl;
 import org.opendaylight.protocol.bmp.spi.registry.BmpMessageRegistry;
+import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 
 public class BmpMockDispatcherTest {
@@ -36,12 +36,13 @@ public class BmpMockDispatcherTest {
         final BmpMockDispatcher dispatcher = new BmpMockDispatcher(this.registry, this.sessionFactory);
         final int port = InetSocketAddressUtil.getRandomPort();
         final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(port);
-        final BmpDispatcherImpl serverDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(),
-            this.registry, this.sessionFactory);
-        final ChannelFuture futureServer = serverDispatcher.createServer(serverAddr, this.slf, Optional.absent());
+        final BmpDispatcherImpl serverDispatcher = new BmpDispatcherImpl(
+                new NioEventLoopGroup(), new NioEventLoopGroup(), this.registry, this.sessionFactory);
+        final ChannelFuture futureServer = serverDispatcher
+                .createServer(serverAddr, this.slf, KeyMapping.getKeyMapping());
         waitFutureComplete(futureServer);
-        final ChannelFuture channelFuture = dispatcher.createClient(InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(0),
-            serverAddr);
+        final ChannelFuture channelFuture = dispatcher.createClient(InetSocketAddressUtil
+                .getRandomLoopbackInetSocketAddress(0), serverAddr);
         waitFutureComplete(channelFuture);
         final Channel channel = channelFuture.sync().channel();
 
@@ -54,11 +55,13 @@ public class BmpMockDispatcherTest {
     public void testCreateServer() throws InterruptedException {
         final BmpMockDispatcher dispatcher = new BmpMockDispatcher(this.registry, this.sessionFactory);
         final int port = InetSocketAddressUtil.getRandomPort();
-        final BmpDispatcherImpl serverDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(),
-            this.registry, this.sessionFactory);
-        final ChannelFuture futureServer = dispatcher.createServer(new InetSocketAddress(InetAddresses.forString("0.0.0.0"), port));
+        final BmpDispatcherImpl serverDispatcher = new BmpDispatcherImpl(
+                new NioEventLoopGroup(), new NioEventLoopGroup(), this.registry, this.sessionFactory);
+        final ChannelFuture futureServer = dispatcher.createServer(
+                new InetSocketAddress(InetAddresses.forString("0.0.0.0"), port));
         waitFutureComplete(futureServer);
-        final ChannelFuture channelFuture = serverDispatcher.createClient(InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(port), this.slf, Optional.absent());
+        final ChannelFuture channelFuture = serverDispatcher.createClient(
+                InetSocketAddressUtil.getRandomLoopbackInetSocketAddress(port), this.slf, KeyMapping.getKeyMapping());
         waitFutureComplete(channelFuture);
         final Channel channel = channelFuture.sync().channel();
 
index 7b1d873ae83dffc420bc3619920c68754f4b0b17..a846ee7d32d9802799e772c10117b67998263420 100644 (file)
@@ -8,7 +8,6 @@
 
 package org.opendaylight.protocol.bmp.mock;
 
-import com.google.common.base.Optional;
 import com.google.common.util.concurrent.Uninterruptibles;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
@@ -31,6 +30,7 @@ import org.opendaylight.protocol.bmp.parser.BmpActivator;
 import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderActivator;
 import org.opendaylight.protocol.bmp.spi.registry.BmpExtensionProviderContext;
 import org.opendaylight.protocol.bmp.spi.registry.SimpleBmpExtensionProviderContext;
+import org.opendaylight.protocol.concepts.KeyMapping;
 import org.opendaylight.protocol.util.InetSocketAddressUtil;
 import org.opendaylight.yangtools.yang.binding.Notification;
 
@@ -44,10 +44,11 @@ public class BmpMockTest {
     public void setUp() {
         final BmpExtensionProviderContext ctx = new SimpleBmpExtensionProviderContext();
         this.bmpActivator = new BmpActivator(
-            ServiceLoaderBGPExtensionProviderContext.getSingletonInstance());
+                ServiceLoaderBGPExtensionProviderContext.getSingletonInstance());
         this.bmpActivator.start(ctx);
-        this.bmpDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(), ctx.getBmpMessageRegistry(),
-            new DefaultBmpSessionFactory());
+        this.bmpDispatcher = new BmpDispatcherImpl(new NioEventLoopGroup(), new NioEventLoopGroup(),
+                ctx.getBmpMessageRegistry(),
+                new DefaultBmpSessionFactory());
     }
 
     @After
@@ -61,10 +62,10 @@ public class BmpMockTest {
         final InetSocketAddress serverAddr = InetSocketAddressUtil.getRandomLoopbackInetSocketAddress();
         final BmpSessionListenerFactory bmpSessionListenerFactory = () -> BmpMockTest.this.sessionListener;
         final ChannelFuture futureServer = this.bmpDispatcher.createServer(serverAddr,
-            bmpSessionListenerFactory, Optional.absent());
+                bmpSessionListenerFactory, KeyMapping.getKeyMapping());
         waitFutureComplete(futureServer);
-        Channel serverChannel;
-        int sessionUpWait;
+        final Channel serverChannel;
+        final int sessionUpWait;
         if (futureServer.isSuccess()) {
             serverChannel = futureServer.channel();
             sessionUpWait = 10;
@@ -74,11 +75,19 @@ public class BmpMockTest {
             sessionUpWait = 40;
         }
 
-        BmpMock.main(new String[]{"--remote_address", InetSocketAddressUtil.toHostAndPort(serverAddr).toString(), "--peers_count", "3", "--pre_policy_routes", "3"});
+        BmpMock.main(new String[]{
+            "--remote_address",
+            InetSocketAddressUtil.toHostAndPort(serverAddr).toString(),
+            "--peers_count", "3",
+            "--pre_policy_routes",
+            "3"});
 
-        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(sessionUpWait))).onSessionUp(Mockito.any(BmpSession.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(sessionUpWait)))
+                .onSessionUp(Mockito.any(BmpSession.class));
         //1 * Initiate message + 3 * PeerUp Notification + 9 * Route Monitoring message
-        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10)).times(13)).onMessage(Mockito.any(Notification.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10))
+                .times(13))
+                .onMessage(Mockito.any(Notification.class));
 
         if (serverChannel != null) {
             serverChannel.close().sync();
@@ -94,10 +103,10 @@ public class BmpMockTest {
         BmpMock.main(new String[]{"--local_address", InetSocketAddressUtil.toHostAndPort(serverAddr).toString(),
             "--peers_count", "3", "--pre_policy_routes", "3", "--passive"});
         final ChannelFuture futureServer = this.bmpDispatcher.createClient(serverAddr,
-            bmpSessionListenerFactory, Optional.absent());
+                bmpSessionListenerFactory, KeyMapping.getKeyMapping());
         waitFutureComplete(futureServer);
-        Channel serverChannel;
-        int sessionUpWait;
+        final Channel serverChannel;
+        final int sessionUpWait;
         if (futureServer.isSuccess()) {
             serverChannel = futureServer.channel();
             sessionUpWait = 10;
@@ -107,9 +116,12 @@ public class BmpMockTest {
             sessionUpWait = 40;
         }
 
-        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(sessionUpWait))).onSessionUp(Mockito.any(BmpSession.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(sessionUpWait)))
+                .onSessionUp(Mockito.any(BmpSession.class));
         //1 * Initiate message + 3 * PeerUp Notification + 9 * Route Monitoring message
-        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10)).times(13)).onMessage(Mockito.any(Notification.class));
+        Mockito.verify(this.sessionListener, Mockito.timeout(TimeUnit.SECONDS.toMillis(10))
+                .times(13))
+                .onMessage(Mockito.any(Notification.class));
 
         if (serverChannel != null) {
             serverChannel.close().sync();
index 1f00469edc510f54437f746d6fd0d31072509f48..cc3be325e1808e7b9e1f0a7dbc455b3f65d79465 100644 (file)
@@ -13,8 +13,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import com.google.common.net.InetAddresses;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.net.InetAddress;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
@@ -62,7 +60,8 @@ public class BmpMockUtilTest {
 
     @Test
     public void testCreateRouteMonitoringPrePolicy() {
-        final RouteMonitoringMessage routeMonitoring = BmpMockUtil.createRouteMonitoring(PEER_IP, AdjRibInType.PrePolicy, PREFIX);
+        final RouteMonitoringMessage routeMonitoring = BmpMockUtil
+                .createRouteMonitoring(PEER_IP, AdjRibInType.PrePolicy, PREFIX);
         final PeerHeader peerHeader = routeMonitoring.getPeerHeader();
         assertEquals(PEER_IP, peerHeader.getAddress().getIpv4Address());
         assertEquals(65431L, peerHeader.getAs().getValue().longValue());
@@ -71,23 +70,14 @@ public class BmpMockUtilTest {
         assertEquals(AdjRibInType.PrePolicy, peerHeader.getAdjRibInType());
         final Update update = routeMonitoring.getUpdate();
         assertEquals(PREFIX, update.getNlri().getNlri().get(0));
-        assertEquals("1.2.3.4", ((Ipv4NextHopCase)update.getAttributes().getCNextHop()).getIpv4NextHop().getGlobal().getValue());
+        assertEquals("1.2.3.4", ((Ipv4NextHopCase) update.getAttributes()
+                .getCNextHop()).getIpv4NextHop().getGlobal().getValue());
     }
 
     @Test
     public void testCreateRouteMonitoringPostPolicy() {
-        final RouteMonitoringMessage routeMonitoring = BmpMockUtil.createRouteMonitoring(PEER_IP, AdjRibInType.PostPolicy, PREFIX);
+        final RouteMonitoringMessage routeMonitoring = BmpMockUtil
+                .createRouteMonitoring(PEER_IP, AdjRibInType.PostPolicy, PREFIX);
         assertEquals(AdjRibInType.PostPolicy, routeMonitoring.getPeerHeader().getAdjRibInType());
     }
-
-    @Test(expected=UnsupportedOperationException.class)
-    public void testPrivateConstructor() throws Throwable {
-        final Constructor<BmpMockUtil> c = BmpMockUtil.class.getDeclaredConstructor();
-        c.setAccessible(true);
-        try {
-            c.newInstance();
-        } catch (final InvocationTargetException e) {
-            throw e.getCause();
-        }
-    }
 }