Merge "BUG-2383 : clean up transaction chains in Peers"

[bgpcep.git] / bgp / rib-impl / src / main / java / org / opendaylight / protocol / bgp / rib / impl / BGPClientSessionNegotiator.java

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
index 2c49463c150cd53c4707ba59b20e304b66fffa5e..41e9b8cc27441d047a1357ace5416acc9743f1b8 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/BGPClientSessionNegotiator.java
@@ -8,13 +8,11 @@
 package org.opendaylight.protocol.bgp.rib.impl;
 
 import io.netty.channel.Channel;
-import io.netty.util.Timer;
 import io.netty.util.concurrent.Promise;
-import org.opendaylight.protocol.bgp.rib.impl.AbstractBGPSessionNegotiator;
-import org.opendaylight.protocol.bgp.rib.impl.BGPSessionImpl;
 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.BGPSessionValidator;
+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;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.Open;
 
@@ -23,20 +21,23 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
  */
 public final class BGPClientSessionNegotiator extends AbstractBGPSessionNegotiator {
 
-    public BGPClientSessionNegotiator(final Timer timer,
-                                      final Promise<BGPSessionImpl> promise, final Channel channel,
-                                      final BGPPeerRegistry registry,
-                                      final BGPSessionValidator sessionValidator) {
-        super(timer, promise, channel, registry, sessionValidator);
+    public BGPClientSessionNegotiator(final Promise<BGPSessionImpl> promise, final Channel channel,
+            final BGPPeerRegistry registry, final BGPSessionValidator sessionValidator) {
+        super(promise, channel, registry, sessionValidator);
     }
 
-    protected Ipv4Address getDestinationId(final Open openMsg,
-            final BGPSessionPreferences preferences) {
+    @Override
+    protected Ipv4Address getDestinationId(final Open openMsg, final BGPSessionPreferences preferences) {
         return preferences.getBgpId();
     }
 
-    protected Ipv4Address getSourceId(final Open openMsg,
-            final BGPSessionPreferences preferences) {
+    @Override
+    protected Ipv4Address getSourceId(final Open openMsg, final BGPSessionPreferences preferences) {
         return openMsg.getBgpIdentifier();
     }
+
+    @Override
+    protected AsNumber getAsNumber(Open openMsg, BGPSessionPreferences preferences) {
+        return preferences.getMyAs();
+    }
 }