BUG-6647 Increase code coverage and clean up II

[bgpcep.git] / bgp / testtool / src / main / java / org / opendaylight / protocol / bgp / testtool / TestingListener.java

diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java
index c66119ad62b0881948e8963144bb17ab30df5b30..2297de7525351d7af0e4f86ee5232e5179239199 100644 (file)
--- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java
+++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/TestingListener.java
@@ -7,9 +7,13 @@
  */
 package org.opendaylight.protocol.bgp.testtool;
 
-import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer;
+import java.util.List;
+import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 import org.opendaylight.protocol.bgp.rib.spi.BGPSession;
+import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener;
 import org.opendaylight.protocol.bgp.rib.spi.BGPTerminationReason;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.Update;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,23 +21,40 @@ import org.slf4j.LoggerFactory;
 /**
  * Testing BGP Listener.
  */
-public class TestingListener implements ReusableBGPPeer {
+final class TestingListener implements BGPSessionListener {
     private static final Logger LOG = LoggerFactory.getLogger(TestingListener.class);
+    private final int nPrefixes;
+    private final List<String> extCom;
+    private final boolean multiPathSupport;
+    private int messageCounter = 0;
+
+    TestingListener(final int nPrefixes, final List<String> extCom, final boolean multiPathSupport) {
+        this.nPrefixes = nPrefixes;
+        this.extCom = extCom;
+        this.multiPathSupport = multiPathSupport;
+    }
 
     @Override
-    public void onMessage(final BGPSession session, final Notification message) {
-        LOG.info("Client Listener: message received: {}", message.toString());
+    public void markUptodate(final TablesKey tablesKey) {
+        LOG.debug("Table marked as up-to-date {}", tablesKey);
     }
 
     @Override
     public void onSessionUp(final BGPSession session) {
         LOG.info("Client Listener: Session Up.");
+        if (this.nPrefixes > 0) {
+            PrefixesBuilder.AdvertiseIpv4Prefixes(((BGPSessionImpl) session).getLimiter(), this.nPrefixes, this.extCom, this.multiPathSupport);
+        }
     }
 
     @Override
     public void onSessionDown(final BGPSession session, final Exception e) {
         LOG.info("Client Listener: Connection lost.");
-        session.close();
+        try {
+            session.close();
+        } catch (Exception ie) {
+            LOG.warn("Error closing session", ie);
+        }
     }
 
     @Override
@@ -41,13 +62,20 @@ public class TestingListener implements ReusableBGPPeer {
         LOG.info("Client Listener: Connection lost: {}.", cause);
     }
 
+    @Override
+    public void onMessage(final BGPSession session, final Notification message) {
+        if (message instanceof Update) {
+            messageCounter++;
+        }
+        LOG.debug("Message received: {}", message.toString());
+    }
+
     @Override
     public void releaseConnection() {
         LOG.info("Client Listener: Connection released.");
     }
 
-    @Override
-    public boolean isSessionActive() {
-        return true;
+    void printCount(final String localAddress) {
+        LOG.info("Peer {} received {} update messages.", localAddress, messageCounter);
     }
 }