BGPCEP-576: Neighbor’s local address configurable

[bgpcep.git] / bgp / rib-impl / src / test / java / org / opendaylight / protocol / bgp / rib / impl / config / BgpPeerTest.java

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
index 57d5d2241879b67e460525dd9c2c182ce93d787e..8de2f9878468fa6f6862c139ea48fa6c4fda0523 100644 (file)
--- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
+++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/config/BgpPeerTest.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 import java.math.BigDecimal;
 import java.net.InetSocketAddress;
@@ -48,10 +49,10 @@ import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev171207.AfiSafi1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev171207.AfiSafi1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev171207.Config1;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev171207.Config1Builder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180321.NeighborAddPathsConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180321.NeighborAddPathsConfigBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180321.NeighborTransportConfig;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.openconfig.extensions.rev180321.NeighborTransportConfigBuilder;
 
 public class BgpPeerTest extends AbstractConfig {
     static final short SHORT = 0;
@@ -59,7 +60,8 @@ public class BgpPeerTest extends AbstractConfig {
     static final String MD5_PASSWORD = "123";
     static final PortNumber PORT = new PortNumber(179);
     static final AfiSafi AFI_SAFI_IPV4 = new AfiSafiBuilder().setAfiSafiName(IPV4UNICAST.class)
-            .addAugmentation(AfiSafi1.class, new AfiSafi1Builder().setReceive(true).setSendMax(SHORT).build()).build();
+            .addAugmentation(NeighborAddPathsConfig.class, new NeighborAddPathsConfigBuilder()
+                       .setReceive(true).setSendMax(SHORT).build()).build();
     static final List<AfiSafi> AFI_SAFI = Collections.singletonList(AFI_SAFI_IPV4);
     private static final BigDecimal DEFAULT_TIMERS = BigDecimal.valueOf(30);
     private BgpPeer bgpPeer;
@@ -79,8 +81,8 @@ public class BgpPeerTest extends AbstractConfig {
     static Transport createTransport() {
         return new TransportBuilder().setConfig(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.
                 rev151009.bgp.neighbor.group.transport.ConfigBuilder().setMtuDiscovery(false)
-                .setPassiveMode(false).addAugmentation(Config1.class, new Config1Builder()
-                        .setRemotePort(PORT).build()).build()).build();
+                .setPassiveMode(false).addAugmentation(NeighborTransportConfig.class,
+                        new NeighborTransportConfigBuilder().setRemotePort(PORT).build()).build()).build();
     }
 
     static Timers createTimers() {
@@ -92,7 +94,7 @@ public class BgpPeerTest extends AbstractConfig {
                 .setConnectRetry(DEFAULT_TIMERS).build()).build();
     }
 
-    static RouteReflector createRR() {
+    private static RouteReflector createRR() {
         return new RouteReflectorBuilder().setConfig(new org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp
                 .rev151009.bgp.neighbor.group.route.reflector.ConfigBuilder()
                 .setRouteReflectorClusterId(RrClusterIdTypeBuilder.getDefaultInstance("127.0.0.1"))
@@ -132,14 +134,14 @@ public class BgpPeerTest extends AbstractConfig {
                 .setTransport(createTransport()).setAddPaths(createAddPath()).build();
 
         this.bgpPeer.start(this.rib, neighbor, null, this.peerGroupLoader, this.tableTypeRegistry);
-        Mockito.verify(this.rib).createPeerDOMChain(any());
-        Mockito.verify(this.rib, times(2)).getLocalAs();
-        Mockito.verify(this.rib).getLocalTables();
+        verify(this.rib).createPeerDOMChain(any());
+        verify(this.rib, times(2)).getLocalAs();
+        verify(this.rib).getLocalTables();
 
         this.bgpPeer.instantiateServiceInstance();
-        Mockito.verify(this.bgpPeerRegistry).addPeer(any(), any(), any());
-        Mockito.verify(this.dispatcher).createReconnectingClient(any(InetSocketAddress.class),
-                anyInt(), any(KeyMapping.class));
+        verify(this.bgpPeerRegistry).addPeer(any(), any(), any());
+        verify(this.dispatcher).createReconnectingClient(any(InetSocketAddress.class),
+                any(InetSocketAddress.class), anyInt(), any(KeyMapping.class));
 
         try {
             this.bgpPeer.start(this.rib, neighbor, null, this.peerGroupLoader, this.tableTypeRegistry);
@@ -150,24 +152,24 @@ public class BgpPeerTest extends AbstractConfig {
         this.bgpPeer.setServiceRegistration(this.serviceRegistration);
         this.bgpPeer.closeServiceInstance();
         this.bgpPeer.close();
-        Mockito.verify(this.future).cancel(true);
+        verify(this.future).cancel(true);
 
         this.bgpPeer.restart(this.rib, null, this.peerGroupLoader, this.tableTypeRegistry);
         this.bgpPeer.instantiateServiceInstance();
-        Mockito.verify(this.rib, times(2)).createPeerDOMChain(any());
-        Mockito.verify(this.rib, times(4)).getLocalAs();
-        Mockito.verify(this.rib, times(2)).getLocalTables();
+        verify(this.rib, times(2)).createPeerDOMChain(any());
+        verify(this.rib, times(4)).getLocalAs();
+        verify(this.rib, times(2)).getLocalTables();
 
         final Neighbor neighborExpected = createNeighborExpected(NEIGHBOR_ADDRESS);
         assertTrue(this.bgpPeer.containsEqualConfiguration(neighborExpected));
         assertFalse(this.bgpPeer.containsEqualConfiguration(createNeighborExpected(
                 new IpAddress(new Ipv4Address("127.0.0.2")))));
-        Mockito.verify(this.bgpPeerRegistry).removePeer(any(IpAddress.class));
+        verify(this.bgpPeerRegistry).removePeer(any(IpAddress.class));
 
         this.bgpPeer.closeServiceInstance();
         this.bgpPeer.close();
-        Mockito.verify(this.serviceRegistration).unregister();
-        Mockito.verify(this.future, times(2)).cancel(true);
+        verify(this.serviceRegistration).unregister();
+        verify(this.future, times(2)).cancel(true);
 
         final Neighbor neighborDiffConfig = new NeighborBuilder().setNeighborAddress(NEIGHBOR_ADDRESS)
                 .setAfiSafis(createAfiSafi()).build();