import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-
import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import io.netty.channel.Channel;
import org.opendaylight.controller.config.yang.netty.threadgroup.NettyThreadgroupModuleFactory;
import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
-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.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
final CommitStatus status = createRegistryInstance(Optional.<String>absent(), Optional.<Integer>absent(), true, true);
assertBeanCount(1, FACTORY_NAME);
assertStatus(status, 3, 0, 0);
- verify(dispatcher).createServer(any(BGPPeerRegistry.class), any(InetSocketAddress.class), any(BGPSessionValidator.class));
- } catch (ValidationException e) {
+ verify(dispatcher).createServer(any(BGPPeerRegistry.class), any(InetSocketAddress.class));
+ } catch (final ValidationException e) {
if(!PlatformDependent.isWindows() && !PlatformDependent.isRoot()) {
Assert.assertTrue(e.getMessage().contains("Unable to bind port"));
} else {
final CommitStatus status = createRegistryInstance(Optional.of("127.0.0.1"), Optional.of(1790), true, true);
assertBeanCount(1, FACTORY_NAME);
assertStatus(status, 3, 0, 0);
- verify(dispatcher).createServer(any(BGPPeerRegistry.class), any(InetSocketAddress.class), any(BGPSessionValidator.class));
+ verify(dispatcher).createServer(any(BGPPeerRegistry.class), any(InetSocketAddress.class));
}
private CommitStatus createRegistryInstance(final Optional<String> address, final Optional<Integer> port, final boolean addRegistry, final boolean addDispatcher ) throws InstanceAlreadyExistsException, ValidationException, ConflictingVersionException {
return transaction.commit();
}
- private ObjectName createPeerRegistry(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
+ private static ObjectName createPeerRegistry(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
return transaction.createModule(StrictBgpPeerRegistryModuleFactory.NAME, "peer-registry");
}
- private ObjectName createDispatcher(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
+ private static ObjectName createDispatcher(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
return transaction.createModule("dispatch", "mock");
}
doReturn(mock(ChannelFuture.class)).when(channel).close();
doReturn(channel).when(future).channel();
doReturn(mock(ChannelFuture.class)).when(future).addListener(any(GenericFutureListener.class));
- doReturn(future).when(dispatcher).createServer(any(BGPPeerRegistry.class), any(InetSocketAddress.class), any(BGPSessionValidator.class));
+ doReturn(future).when(dispatcher).createServer(any(BGPPeerRegistry.class), any(InetSocketAddress.class));
doNothing().when(dispatcher).close();
}