BGPCEP-728: BMP Mock clustering

Fix clustering connection for bmp test tool
-enforce findbug

Change-Id: Icd0cb21467ab5c8fbea38a2561f0330cbdc5914d
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>
(cherry picked from commit dd553db0255426051b8fd7f201a9895759c8bcba)

diff --git a/bgp/bmp-mock/pom.xml b/bgp/bmp-mock/pom.xml
index 428e34d66961c96796c919fcb3f2d099760b0f08..72905ae352df8c7f9701f7c623cb22ea2214c82c 100644 (file)
--- a/bgp/bmp-mock/pom.xml
+++ b/bgp/bmp-mock/pom.xml
@@ -112,6 +112,13 @@
                     <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <configuration>
+                    <failOnError>true</failOnError>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

diff --git a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java
index fbd820bd077889d60234deee4b43c03ab41b3965..d3a7083e72bbc5cbe40a76c5bd518a59959497d5 100644 (file)
--- a/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java
+++ b/bgp/bmp-mock/src/main/java/org/opendaylight/protocol/bmp/mock/BmpMock.java
@@ -62,11 +62,12 @@ public final class BmpMock {
         final InetSocketAddress localAddress = arguments.getLocalAddress();
         InetAddress currentLocal = localAddress.getAddress();
         final int port = localAddress.getPort();
-        for (final InetSocketAddress remoteAddress : arguments.getRemoteAddress()) {
-            for (int i = 0; i < arguments.getRoutersCount(); i++) {
+        for (int i = 0; i < arguments.getRoutersCount(); i++) {
+            for (final InetSocketAddress remoteAddress : arguments.getRemoteAddress()) {
                 dispatcher.createClient(new InetSocketAddress(currentLocal, port), remoteAddress);
-                currentLocal = InetAddresses.increment(currentLocal);
             }
+            currentLocal = InetAddresses.increment(currentLocal);
+
         }
     }