From: Claudio D. Gasparini Date: Wed, 18 Nov 2015 15:38:50 +0000 (+0100) Subject: Move releaseConnection from ReusableBGPPeer to BGPSessionListener X-Git-Tag: release/beryllium~76 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e6d9fbf96737ba5d69a77ac79127b348d13d6a7a;p=bgpcep.git Move releaseConnection from ReusableBGPPeer to BGPSessionListener Move releaseConnection from ReusableBGPPeer to BGPSessionListener Change-Id: Ief296eccc81cc00661462cc9ec861ff4acc379de Signed-off-by: Claudio D. Gasparini --- diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java index 3fdfb65613..f73ed6b7d2 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/controller/config/yang/bgp/rib/impl/StrictBgpPeerRegistryModule.java @@ -5,7 +5,6 @@ import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; @@ -71,7 +70,7 @@ public class StrictBgpPeerRegistryModule extends org.opendaylight.controller.con } @Override - public void addPeer(final IpAddress ip, final ReusableBGPPeer peer, final BGPSessionPreferences preferences) { + public void addPeer(final IpAddress ip, final BGPSessionListener peer, final BGPSessionPreferences preferences) { this.global.addPeer(ip, peer, preferences); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java index d9942cb188..60acf37e72 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPPeer.java @@ -31,8 +31,8 @@ import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionStatistics; import org.opendaylight.protocol.bgp.rib.impl.spi.RIB; import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContext; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; 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.protocol.bgp.rib.spi.Peer; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix; @@ -65,7 +65,7 @@ import org.slf4j.LoggerFactory; * Class representing a peer. We have a single instance for each peer, which provides translation from BGP events into * RIB actions. */ -public class BGPPeer implements ReusableBGPPeer, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener { +public class BGPPeer implements BGPSessionListener, Peer, AutoCloseable, BGPPeerRuntimeMXBean, TransactionChainListener { private static final Logger LOG = LoggerFactory.getLogger(BGPPeer.class); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java index 4600aa9097..0a57de9204 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistry.java @@ -31,7 +31,6 @@ import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.parser.impl.message.open.As4CapabilityHandler; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; @@ -60,14 +59,14 @@ public final class StrictBGPPeerRegistry implements BGPPeerRegistry { public static final StrictBGPPeerRegistry GLOBAL = new StrictBGPPeerRegistry(); @GuardedBy("this") - private final Map peers = Maps.newHashMap(); + private final Map peers = Maps.newHashMap(); @GuardedBy("this") private final Map sessionIds = Maps.newHashMap(); @GuardedBy("this") private final Map peerPreferences = Maps.newHashMap(); @Override - public synchronized void addPeer(final IpAddress ip, final ReusableBGPPeer peer, final BGPSessionPreferences preferences) { + public synchronized void addPeer(final IpAddress ip, final BGPSessionListener peer, final BGPSessionPreferences preferences) { Preconditions.checkNotNull(ip); Preconditions.checkArgument(!this.peers.containsKey(ip), "Peer for %s already present", ip); this.peers.put(ip, Preconditions.checkNotNull(peer)); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java index 97a8f49c9c..b6c520954b 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/BGPPeerRegistry.java @@ -24,10 +24,10 @@ public interface BGPPeerRegistry extends AutoCloseable { * Add configured peer, its IP address and preferences. To be used when a BGP session is established. * * @param ip address of remote peer - * @param peer configured peer as ReusableBGPPeer + * @param peer configured peer as BGPSessionListener * @param prefs session preferences for configured peer */ - void addPeer(IpAddress ip, ReusableBGPPeer peer, BGPSessionPreferences prefs); + void addPeer(IpAddress ip, BGPSessionListener peer, BGPSessionPreferences prefs); /** * Remove configured peer from registry. diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/ReusableBGPPeer.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/ReusableBGPPeer.java deleted file mode 100644 index f565090834..0000000000 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/ReusableBGPPeer.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.bgp.rib.impl.spi; - -import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; - -public interface ReusableBGPPeer extends BGPSessionListener { - - // TODO merge with BGPSessionListener ? - - void releaseConnection(); - -} diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java index b217f9481c..4f73d6108e 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/FromExternalImportPolicyTest.java @@ -27,9 +27,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLe import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableUnkeyedListNodeBuilder; -/** - * Created by cgasparini on 10.6.2015. - */ public class FromExternalImportPolicyTest { private static final QName DATA_QNAME = QName.cachedReference(QName.create("urn:opendaylight:params:xml:ns:yang:bgp-inet", "2013-09-19", "attributes")); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java index 84d65a87d1..c7e3d3aaca 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SimpleSessionListener.java @@ -9,8 +9,8 @@ package org.opendaylight.protocol.bgp.rib.impl; import com.google.common.collect.Lists; import java.util.List; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; 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.rib.rev130925.rib.TablesKey; import org.opendaylight.yangtools.yang.binding.Notification; @@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory; /** * Listener for the client. */ -public class SimpleSessionListener implements ReusableBGPPeer { +public class SimpleSessionListener implements BGPSessionListener { private final List listMsg = Lists.newArrayList(); diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java deleted file mode 100644 index 0986680826..0000000000 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionListener.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.bgp.rib.impl; - -import com.google.common.collect.Lists; -import java.util.List; -import java.util.Set; -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.multiprotocol.rev130919.BgpTableType; -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; - -/** - * Listener for the BGP Speaker. - */ -public class SpeakerSessionListener implements BGPSessionListener { - - public List messages = Lists.newArrayList(); - - public boolean up = false; - - public Set types; - - private static final Logger LOG = LoggerFactory.getLogger(SpeakerSessionListener.class); - - public SpeakerSessionListener() { - } - - @Override - public void onMessage(final BGPSession session, final Notification message) { - LOG.debug("Received message: {} {}", message.getClass(), message); - this.messages.add(message); - } - - @Override - public synchronized void onSessionUp(final BGPSession session) { - LOG.debug("Session up."); - this.up = true; - this.types = session.getAdvertisedTableTypes(); - this.notifyAll(); - } - - @Override - public void onSessionDown(final BGPSession session, final Exception e) { - LOG.debug("Session down."); - this.up = false; - } - - @Override - public void onSessionTerminated(final BGPSession session, final BGPTerminationReason cause) { - LOG.debug("Session terminated. Cause : {}", cause.toString()); - this.up = false; - } - - @Override - public boolean isSessionActive() { - return true; - } - - @Override - public void markUptodate(final TablesKey tablesKey) { - LOG.debug("Table marked as up-to-date {}", tablesKey); - } -} diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java deleted file mode 100644 index 7f640f98d2..0000000000 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/SpeakerSessionMock.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.bgp.rib.impl; - -import static org.mockito.Mockito.mock; - -import io.netty.channel.Channel; -import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.OpenBuilder; -import org.opendaylight.yangtools.yang.binding.Notification; - -/** - * Mock of the BGP speakers session. - */ -public class SpeakerSessionMock extends BGPSessionImpl { - - private final BGPSessionListener client; - - SpeakerSessionMock(final BGPSessionListener listener, final BGPSessionListener client) { - super(listener, mock(Channel.class), new OpenBuilder().setHoldTimer(5).build(), 10, null); - this.client = client; - } - - @Override - public void writeAndFlush(final Notification msg) { - this.setLastMessageSentAt(System.nanoTime()); - this.client.onMessage(this, msg); - } -} diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java index 478edb6da2..fd48d6581d 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/StrictBGPPeerRegistryTest.java @@ -21,7 +21,6 @@ import org.mockito.Mockito; import org.opendaylight.protocol.bgp.parser.BGPDocumentedException; import org.opendaylight.protocol.bgp.parser.BGPError; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; @@ -42,7 +41,7 @@ public class StrictBGPPeerRegistryTest { private static final IpAddress REMOTE_IP = new IpAddress(FROM); private static final Ipv4Address TO = new Ipv4Address("255.255.255.255"); - private final ReusableBGPPeer peer1 = getMockSession(); + private final BGPSessionListener peer1 = getMockSession(); private final Open classicOpen = createOpen(TO, LOCAL_AS); private StrictBGPPeerRegistry peerRegistry; private BGPSessionPreferences mockPreferences; @@ -61,8 +60,8 @@ public class StrictBGPPeerRegistryTest { this.mockPreferences = new BGPSessionPreferences(LOCAL_AS, 1, new Ipv4Address("0.0.0.1"), LOCAL_AS, Collections. emptyList()); } - private static ReusableBGPPeer getMockSession() { - final ReusableBGPPeer mock = Mockito.mock(ReusableBGPPeer.class); + private static BGPSessionListener getMockSession() { + final BGPSessionListener mock = Mockito.mock(BGPSessionListener.class); Mockito.doNothing().when(mock).releaseConnection(); return mock; } @@ -103,7 +102,7 @@ public class StrictBGPPeerRegistryTest { final IpAddress remoteIp2 = new IpAddress(to2); this.peerRegistry.addPeer(REMOTE_IP, this.peer1, this.mockPreferences); - final ReusableBGPPeer session2 = getMockSession(); + final BGPSessionListener session2 = getMockSession(); this.peerRegistry.addPeer(remoteIp2, session2, this.mockPreferences); final BGPSessionListener returnedSession1 = this.peerRegistry.getPeer(REMOTE_IP, FROM, TO, this.classicOpen); diff --git a/bgp/rib-mock/src/test/java/org/opendaylight/protocol/bgp/rib/mock/BGPListenerMock.java b/bgp/rib-mock/src/test/java/org/opendaylight/protocol/bgp/rib/mock/BGPListenerMock.java deleted file mode 100644 index 9b34e7f6e7..0000000000 --- a/bgp/rib-mock/src/test/java/org/opendaylight/protocol/bgp/rib/mock/BGPListenerMock.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * 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.bgp.rib.mock; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -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.rib.rev130925.rib.TablesKey; -import org.opendaylight.yangtools.yang.binding.Notification; - -/** - * Mock implementation of {@link BGPSessionListener} for testing purposes. - */ -public final class BGPListenerMock implements BGPSessionListener { - private final List buffer = Collections.synchronizedList(new ArrayList()); - private boolean connected = false; - - protected List getBuffer() { - return this.buffer; - } - - protected boolean isConnected() { - return this.connected; - } - - @Override - public void onMessage(final BGPSession session, final Notification message) { - this.buffer.add(message); - } - - @Override - public void onSessionUp(final BGPSession session) { - this.connected = true; - } - - @Override - public void onSessionDown(final BGPSession session, final Exception e) { - this.connected = false; - - } - - @Override - public void onSessionTerminated(final BGPSession session, final BGPTerminationReason reason) { - this.connected = false; - } - - @Override - public boolean isSessionActive() { - return true; - } - - @Override - public void markUptodate(final TablesKey tablesKey) { - } -} diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java index 7a93fb218f..f34cdb10ae 100644 --- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java +++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/BGPSessionListener.java @@ -59,4 +59,6 @@ public interface BGPSessionListener extends EventListener { * @param notification Protocol message */ void onMessage(BGPSession session, Notification notification); + + void releaseConnection(); } diff --git a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/Main.java b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/Main.java index d68f24bfc0..e593770b09 100644 --- a/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/Main.java +++ b/bgp/testtool/src/main/java/org/opendaylight/protocol/bgp/testtool/Main.java @@ -19,7 +19,7 @@ import org.opendaylight.protocol.bgp.rib.impl.BGPDispatcherImpl; import org.opendaylight.protocol.bgp.rib.impl.BGPSessionProposalImpl; import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; +import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; import org.opendaylight.protocol.framework.NeverReconnectStrategy; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; @@ -95,7 +95,7 @@ public final class Main { final Main m = new Main(); - final ReusableBGPPeer sessionListener = new TestingListener(); + final BGPSessionListener sessionListener = new TestingListener(); final Map, Class> tables = new HashMap<>(); tables.put(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class); 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 84e2831656..f0f91888d5 100644 --- 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,8 +7,8 @@ */ package org.opendaylight.protocol.bgp.testtool; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; 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.rib.rev130925.rib.TablesKey; import org.opendaylight.yangtools.yang.binding.Notification; @@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory; /** * Testing BGP Listener. */ -public class TestingListener implements ReusableBGPPeer { +public class TestingListener implements BGPSessionListener { private static final Logger LOG = LoggerFactory.getLogger(TestingListener.class); @Override diff --git a/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java b/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java index 347ba9c036..fd5698cf0a 100644 --- a/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java +++ b/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/BGPSpeakerMock.java @@ -23,7 +23,6 @@ import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl; import org.opendaylight.protocol.bgp.rib.impl.BGPSessionProposalImpl; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry; import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences; -import org.opendaylight.protocol.bgp.rib.impl.spi.ReusableBGPPeer; import org.opendaylight.protocol.bgp.rib.spi.BGPSessionListener; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; @@ -53,7 +52,7 @@ public class BGPSpeakerMock { this.peerRegistry = new BGPPeerRegistry() { @Override - public void addPeer(final IpAddress ip, final ReusableBGPPeer peer, final BGPSessionPreferences prefs) { + public void addPeer(final IpAddress ip, final BGPSessionListener peer, final BGPSessionPreferences prefs) { } @Override diff --git a/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/SpeakerSessionListener.java b/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/SpeakerSessionListener.java index 40567ea160..537dc26ce5 100644 --- a/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/SpeakerSessionListener.java +++ b/bgp/testtool/src/test/java/org/opendaylight/protocol/bgp/testtool/SpeakerSessionListener.java @@ -45,6 +45,11 @@ public class SpeakerSessionListener implements BGPSessionListener { // this.d.stop(); } + @Override + public void releaseConnection() { + + } + @Override public boolean isSessionActive() { return true;