import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.Map;
-import java.util.concurrent.ExecutionException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.protocol.bgp.rib.spi.state.BGPGracelfulRestartState;
import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerMessagesState;
import org.opendaylight.protocol.bgp.rib.spi.state.BGPPeerState;
-import org.opendaylight.protocol.bgp.rib.spi.state.BGPRIBState;
+import org.opendaylight.protocol.bgp.rib.spi.state.BGPRibState;
import org.opendaylight.protocol.bgp.rib.spi.state.BGPSessionState;
import org.opendaylight.protocol.bgp.rib.spi.state.BGPTimersState;
import org.opendaylight.protocol.bgp.rib.spi.state.BGPTransportState;
-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.IpAddressNoZone;
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.message.rev130919.Update;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.message.BgpParameters;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerRole;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.Update;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev180329.open.message.BgpParameters;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerRole;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.RibId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
public class AddPathAllPathsTest extends AbstractAddPathTest {
private RIBImpl ribImpl;
private Channel serverChannel;
+ @Override
@Before
public void setUp() throws Exception {
super.setUp();
- final Map<TablesKey, PathSelectionMode> pathTables = ImmutableMap.of(TABLES_KEY, new AllPathSelection());
+ final Map<TablesKey, PathSelectionMode> pathTables
+ = ImmutableMap.of(TABLES_KEY, new AllPathSelection());
- this.ribImpl = new RIBImpl(this.clusterSingletonServiceProvider, new RibId("test-rib"),
- AS_NUMBER, BGP_ID, null, this.ribExtension, this.serverDispatcher, this.mappingService.getCodecFactory(),
- getDomBroker(), TABLES_TYPE, pathTables, this.ribExtension.getClassLoadingStrategy());
+ this.ribImpl = new RIBImpl(this.tableRegistry, new RibId("test-rib"), AS_NUMBER, BGP_ID,
+ this.ribExtension, this.serverDispatcher, this.codecsRegistry,
+ getDomBroker(), getDataBroker(), this.policies, TABLES_TYPE, pathTables);
this.ribImpl.instantiateServiceInstance();
- this.ribImpl.onGlobalContextUpdated(this.schemaContext);
- final ChannelFuture channelFuture = this.serverDispatcher.createServer(new InetSocketAddress(RIB_ID, PORT));
+ this.ribImpl.onGlobalContextUpdated(this.schemaService.getGlobalContext());
+ final ChannelFuture channelFuture = this.serverDispatcher.createServer(
+ new InetSocketAddress(RIB_ID, PORT.toJava()));
waitFutureSuccess(channelFuture);
this.serverChannel = channelFuture.channel();
}
+ @Override
@After
- public void tearDown() throws ExecutionException, InterruptedException {
+ public void tearDown() throws Exception {
waitFutureSuccess(this.serverChannel.close());
super.tearDown();
}
+
/*
* All-Paths
* ___________________
* | ODL BGP 127.0.0.1 |
- * [peer://127.0.0.2; p1, lp100] --(iBGP)--> | | --(RR-client, non add-path) --> [Peer://127.0.0.5; (p1, lp100), (p1, lp1200)]
- * [peer://127.0.0.3; p1, lp200] --(iBGP)--> | |
- * [peer://127.0.0.4; p1, lp50] --(iBGP)--> | | --(RR-client, add-path) --> [Peer://127.0.0.6; (p1, path-id1, lp100), (p1, path-id2, pl50), (p1, path-id3, pl200), (p1, path-id4, pl20)]
- * [peer://127.0.0.2; p1, lp20] --(iBGP)--> |___________________|
- * p1 = 1.1.1.1/32
+ * [peer://127.0.0.2; p1, lp100] --(iBGP)--> | | --(RR-client, non add-path) -->
+ * [peer://127.0.0.3; p1, lp200] --(iBGP)--> | | [Peer://127.0.0.5; (p1, lp100), (p1, lp1200)]
+ * [peer://127.0.0.4; p1, lp50] --(iBGP)--> | | --(RR-client, add-path) -->
+ * [peer://127.0.0.2; p1, lp20] --(iBGP)--> |___________________| [Peer://127.0.0.6; (p1, path-id1, lp100),
+ * p1 = 1.1.1.1/32 (p1, path-id2, pl50), (p1, path-id3, pl200),
+ * (p1, path-id4, pl20)]
*/
@Test
public void testUseCase1() throws Exception {
final BgpParameters nonAddPathParams = createParameter(false);
final BgpParameters addPathParams = createParameter(true);
- final BGPPeer peer1 = configurePeer(PEER1, this.ribImpl, nonAddPathParams, PeerRole.Ibgp, this.serverRegistry);
+ final BGPPeer peer1 = configurePeer(this.tableRegistry, PEER1, this.ribImpl, nonAddPathParams, PeerRole.Ibgp,
+ this.serverRegistry);
final BGPSessionImpl session1 = createPeerSession(PEER1, nonAddPathParams, new SimpleSessionListener());
- configurePeer(PEER2, this.ribImpl, nonAddPathParams, PeerRole.Ibgp, this.serverRegistry);
+ configurePeer(this.tableRegistry, PEER2, this.ribImpl, nonAddPathParams, PeerRole.Ibgp, this.serverRegistry);
final BGPSessionImpl session2 = createPeerSession(PEER2, nonAddPathParams, new SimpleSessionListener());
- configurePeer(PEER3, this.ribImpl, nonAddPathParams, PeerRole.Ibgp, this.serverRegistry);
+ configurePeer(this.tableRegistry, PEER3, this.ribImpl, nonAddPathParams, PeerRole.Ibgp, this.serverRegistry);
final BGPSessionImpl session3 = createPeerSession(PEER3, nonAddPathParams, new SimpleSessionListener());
final SimpleSessionListener listener4 = new SimpleSessionListener();
- final BGPPeer peer4 = configurePeer(PEER4, this.ribImpl, nonAddPathParams, PeerRole.RrClient, this.serverRegistry);
+ final BGPPeer peer4 = configurePeer(this.tableRegistry, PEER4, this.ribImpl, nonAddPathParams,
+ PeerRole.RrClient, this.serverRegistry);
BGPPeerState peer4State = peer4.getPeerState();
assertNull(peer4State.getGroupId());
- assertEquals(new IpAddress(PEER4), peer4State.getNeighborAddress());
+ assertEquals(new IpAddressNoZone(PEER4), peer4State.getNeighborAddress());
assertEquals(0L, peer4State.getTotalPathsCount());
assertEquals(0L, peer4State.getTotalPrefixes());
final BGPSessionImpl session4 = createPeerSession(PEER4, nonAddPathParams, listener4);
final SimpleSessionListener listener5 = new SimpleSessionListener();
- configurePeer(PEER5, this.ribImpl, addPathParams, PeerRole.RrClient, this.serverRegistry);
+ configurePeer(this.tableRegistry, PEER5, this.ribImpl, addPathParams, PeerRole.RrClient, this.serverRegistry);
final BGPSessionImpl session5 = createPeerSession(PEER5, addPathParams, listener5);
checkPeersPresentOnDataStore(5);
//the best route
sendRouteAndCheckIsOnLocRib(session1, PREFIX1, 100, 1);
- checkReceivedMessages(listener4, 1);
- checkReceivedMessages(listener5, 1);
- assertEquals(UPD_100, listener5.getListMsg().get(0));
+ checkReceivedMessages(listener4, 2);
+ checkReceivedMessages(listener5, 2);
+ assertEquals(UPD_100, listener5.getListMsg().get(1));
final BGPPeerState peer1State = peer1.getPeerState();
assertNull(peer1State.getGroupId());
- assertEquals(new IpAddress(PEER1), peer1State.getNeighborAddress());
+ assertEquals(new IpAddressNoZone(PEER1), peer1State.getNeighborAddress());
assertEquals(1L, peer1State.getTotalPathsCount());
assertEquals(1L, peer1State.getTotalPrefixes());
final BGPTransportState transportStatePeer1 = peer1State.getBGPTransportState();
assertEquals(new PortNumber(PORT), transportStatePeer1.getLocalPort());
- assertEquals(new IpAddress(PEER1), transportStatePeer1.getRemoteAddress());
+ assertEquals(new IpAddressNoZone(PEER1), transportStatePeer1.getRemoteAddress());
assertEquals(State.UP, peer1State.getBGPSessionState().getSessionState());
- checkEquals(()-> assertEquals(1L, peer1State.getBGPPeerMessagesState().getUpdateMessagesReceivedCount()));
- checkEquals(()-> assertEquals(0L, peer1State.getBGPPeerMessagesState().getUpdateMessagesSentCount()));
+ checkEquals(() -> assertEquals(1L, peer1State.getBGPPeerMessagesState().getUpdateMessagesReceivedCount()));
+ checkEquals(() -> assertEquals(1L, peer1State.getBGPPeerMessagesState().getUpdateMessagesSentCount()));
final BGPSessionState sessionStatePeer1 = peer1State.getBGPSessionState();
assertFalse(sessionStatePeer1.isAddPathCapabilitySupported());
assertFalse(afiSafiStatePeer1.isPeerRestarting());
assertTrue(afiSafiStatePeer1.isAfiSafiSupported(TABLES_KEY));
- final BGPRIBState ribState = this.ribImpl.getRIBState();
+ final BGPRibState ribState = this.ribImpl.getRIBState();
assertEquals(1, ribState.getPathsCount().size());
- assertEquals(1L, ribState.getPrefixesCount().size());
+ assertEquals(1L, ribState.getTablesPrefixesCount().size());
assertEquals(BGP_ID, ribState.getRouteId());
assertEquals(AS_NUMBER, ribState.getAs());
assertEquals(1L, ribState.getPathCount(TABLES_KEY));
assertEquals(1L, ribState.getTotalPrefixesCount());
final SimpleSessionListener listener6 = new SimpleSessionListener();
- final BGPPeer peer6 = configurePeer(PEER6, this.ribImpl, nonAddPathParams, PeerRole.RrClient, this.serverRegistry);
+ final BGPPeer peer6 = configurePeer(this.tableRegistry, PEER6, this.ribImpl, nonAddPathParams,
+ PeerRole.RrClient, this.serverRegistry);
final BGPSessionImpl session6 = createPeerSession(PEER6, nonAddPathParams, listener6);
checkPeersPresentOnDataStore(6);
- checkReceivedMessages(listener6, 1);
- assertEquals(UPD_NA_100, listener6.getListMsg().get(0));
+ checkReceivedMessages(listener6, 2);
+ assertEquals(UPD_NA_100, listener6.getListMsg().get(1));
causeBGPError(session6);
- checkEquals(()-> assertEquals(1L, peer6.getPeerState().getBGPPeerMessagesState().getNotificationMessagesSentCount()));
+ checkEquals(() -> assertEquals(1L,
+ peer6.getPeerState().getBGPPeerMessagesState().getNotificationMessagesSentCount()));
checkPeersPresentOnDataStore(5);
//the second best route
sendRouteAndCheckIsOnLocRib(session2, PREFIX1, 50, 2);
- checkReceivedMessages(listener4, 1);
- checkReceivedMessages(listener5, 2);
- assertEquals(UPD_50, listener5.getListMsg().get(1));
+ checkReceivedMessages(listener4, 2);
+ checkReceivedMessages(listener5, 3);
+ assertEquals(UPD_50, listener5.getListMsg().get(2));
//new best route
sendRouteAndCheckIsOnLocRib(session3, PREFIX1, 200, 3);
- checkReceivedMessages(listener4, 2);
- checkReceivedMessages(listener5, 3);
- assertEquals(UPD_200, listener5.getListMsg().get(2));
+ checkReceivedMessages(listener4, 3);
+ checkReceivedMessages(listener5, 4);
+ assertEquals(UPD_200, listener5.getListMsg().get(3));
peer4State = peer4.getPeerState();
assertNull(peer4State.getGroupId());
- assertEquals(new IpAddress(PEER4), peer4State.getNeighborAddress());
+ assertEquals(new IpAddressNoZone(PEER4), peer4State.getNeighborAddress());
assertEquals(0L, peer4State.getTotalPathsCount());
assertEquals(0L, peer4State.getTotalPrefixes());
final BGPTransportState transportState = peer4State.getBGPTransportState();
assertEquals(new PortNumber(PORT), transportState.getLocalPort());
- assertEquals(new IpAddress(PEER4), transportState.getRemoteAddress());
+ assertEquals(new IpAddressNoZone(PEER4), transportState.getRemoteAddress());
final BGPPeerMessagesState peerMessagesState = peer4State.getBGPPeerMessagesState();
assertEquals(0L, peerMessagesState.getNotificationMessagesReceivedCount());
assertEquals(0L, peerMessagesState.getNotificationMessagesSentCount());
assertEquals(0L, peerMessagesState.getUpdateMessagesReceivedCount());
- assertEquals(2L, peerMessagesState.getUpdateMessagesSentCount());
+ assertEquals(3L, peerMessagesState.getUpdateMessagesSentCount());
final BGPSessionState bgpSessionState = peer4State.getBGPSessionState();
assertEquals(State.UP, bgpSessionState.getSessionState());
//the worst route
sendRouteAndCheckIsOnLocRib(session1, PREFIX1, 20, 3);
- checkReceivedMessages(listener4, 2);
- checkReceivedMessages(listener5, 4);
- assertEquals(UPD_200.getAttributes().getLocalPref(), ((Update) listener4.getListMsg().get(1)).getAttributes().getLocalPref());
- assertEquals(UPD_20, listener5.getListMsg().get(3));
+ checkReceivedMessages(listener4, 3);
+ checkReceivedMessages(listener5, 5);
+ assertEquals(UPD_200.getAttributes().getLocalPref(),
+ ((Update) listener4.getListMsg().get(2)).getAttributes().getLocalPref());
+ assertEquals(UPD_20, listener5.getListMsg().get(4));
//withdraw second best route, 1 advertisement(1 withdrawal) for add-path supported, none for non add path
sendWithdrawalRouteAndCheckIsOnLocRib(session1, PREFIX1, 100, 2);
- checkReceivedMessages(listener4, 2);
- checkReceivedMessages(listener5, 5);
+ checkReceivedMessages(listener4, 3);
+ checkReceivedMessages(listener5, 6);
//we advertise again to try new test
sendRouteAndCheckIsOnLocRib(session1, PREFIX1, 100, 3);
- checkReceivedMessages(listener4, 2);
- checkReceivedMessages(listener5, 6);
- assertEquals(UPD_200, listener5.getListMsg().get(2));
-
- //withdraw second best route, 1 advertisement(1 withdrawal) for add-path supported, 1 for non add path (withdrawal)
- sendWithdrawalRouteAndCheckIsOnLocRib(session3, PREFIX1, 200, 2);
checkReceivedMessages(listener4, 3);
checkReceivedMessages(listener5, 7);
+ assertEquals(UPD_200, listener5.getListMsg().get(3));
+
+ // withdraw second best route, 1 advertisement(1 withdrawal) for add-path supported, 1 for non add path
+ // (withdrawal)
+ sendWithdrawalRouteAndCheckIsOnLocRib(session3, PREFIX1, 200, 2);
+ checkReceivedMessages(listener4, 4);
+ checkReceivedMessages(listener5, 8);
sendNotification(session1);
- checkEquals(()-> assertEquals(1L, peer1.getPeerState().getBGPPeerMessagesState().getNotificationMessagesReceivedCount()));
+ checkEquals(() -> assertEquals(1L,
+ peer1.getPeerState().getBGPPeerMessagesState().getNotificationMessagesReceivedCount()));
session1.close();
session2.close();
session3.close();
Code Review / bgpcep.git / blobdiff