<module>
<type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-rib</type>
<name>base-bgp-rib</name>
+ <as-number>64496</as-number>
+ <bgp-id>192.0.2.2</bgp-id>
</module>
<module>
<type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate">prefix:bgp-linkstate</type>
public interface BGPSession extends ProtocolSession<Notification> {
Set<BgpTableType> getAdvertisedTableTypes();
+
+ byte[] getBgpId();
}
import org.opendaylight.protocol.bgp.rib.impl.BGPSessionProposalImpl;
import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionProposal;
+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.linkstate.rev131125.LinkstateAddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.LinkstateSubsequentAddressFamily;
"value " + getBgpId() + " is not valid IPv4 address", this.bgpIdJmxAttribute);
JmxAttributeValidationException.checkNotNull(getAsNumber(), "value is not set.", this.asNumberJmxAttribute);
- JmxAttributeValidationException.checkCondition(getAsNumber() >= 0, "value must be greather than 0", this.asNumberJmxAttribute);
+ JmxAttributeValidationException.checkCondition(getAsNumber().intValue() > 0, "value must be greater than 0",
+ this.asNumberJmxAttribute);
JmxAttributeValidationException.checkNotNull(getHoldtimer(), "value is not set.", this.holdtimerJmxAttribute);
JmxAttributeValidationException.checkCondition((getHoldtimer() == 0) || (getHoldtimer() >= 3), "value must be 0 or 3 and more",
final Map<Class<? extends AddressFamily>, Class<? extends SubsequentAddressFamily>> tables = new HashMap<>();
tables.put(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
tables.put(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
- final BGPSessionProposalImpl bgpSessionProposal = new BGPSessionProposalImpl(getHoldtimer(), getAsNumber(), bgpId, tables);
+ final BGPSessionProposalImpl bgpSessionProposal = new BGPSessionProposalImpl(getHoldtimer(), new AsNumber(getAsNumber()), bgpId, tables);
return new BgpSessionProposalCloseable(bgpSessionProposal);
}
import org.opendaylight.protocol.concepts.ListenerRegistration;
import org.opendaylight.protocol.framework.ReconnectStrategy;
import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
import com.google.common.base.Preconditions;
/**
*
*/
-public final class RIBImplModule
-extends
-org.opendaylight.controller.config.yang.bgp.rib.impl.AbstractRIBImplModule {
+public final class RIBImplModule extends org.opendaylight.controller.config.yang.bgp.rib.impl.AbstractRIBImplModule {
- public RIBImplModule(
- final org.opendaylight.controller.config.api.ModuleIdentifier name,
+ public RIBImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier name,
final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
super(name, dependencyResolver);
}
- public RIBImplModule(
- final org.opendaylight.controller.config.api.ModuleIdentifier name,
- final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
- final RIBImplModule oldModule, final java.lang.AutoCloseable oldInstance) {
+ public RIBImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier name,
+ final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final RIBImplModule oldModule,
+ final java.lang.AutoCloseable oldInstance) {
super(name, dependencyResolver, oldModule, oldInstance);
}
@Override
public void validate() {
super.validate();
- JmxAttributeValidationException.checkNotNull(getExtensions(),
- "is not set.", extensionsJmxAttribute);
- JmxAttributeValidationException.checkNotNull(getRibId(),
- "is not set.", ribIdJmxAttribute);
+ JmxAttributeValidationException.checkNotNull(getExtensions(), "is not set.", this.extensionsJmxAttribute);
+ JmxAttributeValidationException.checkNotNull(getRibId(), "is not set.", this.ribIdJmxAttribute);
+ JmxAttributeValidationException.checkNotNull(getLocalAs(), "is not set.", this.localAsJmxAttribute);
+ JmxAttributeValidationException.checkNotNull(getBgpId(), "is not set.", this.localAsJmxAttribute);
}
@Override
public java.lang.AutoCloseable createInstance() {
- final RibImplCloseable rib = new RibImplCloseable(getRibId(), getExtensionsDependency(), getDataProviderDependency());
+ final RibImplCloseable rib = new RibImplCloseable(getRibId(), new AsNumber(getLocalAs()), getBgpId().getBytes(), getExtensionsDependency(), getDataProviderDependency());
final List<ListenerRegistration<BGPSessionListener>> regs = new ArrayList<>();
for (final BGP bgp : getBgpDependency()) {
final BGPPeer peer = new BGPPeer(rib, "peer-" + bgp.toString());
- regs.add(Preconditions.checkNotNull(bgp
- .registerUpdateListener(peer,
- new ReconnectStrategyFactory() {
- @Override
- public ReconnectStrategy createReconnectStrategy() {
- return getTcpReconnectStrategyDependency();
- }
- }, getSessionReconnectStrategyDependency())));
+ regs.add(Preconditions.checkNotNull(bgp.registerUpdateListener(peer, new ReconnectStrategyFactory() {
+ @Override
+ public ReconnectStrategy createReconnectStrategy() {
+ return getTcpReconnectStrategyDependency();
+ }
+ }, getSessionReconnectStrategyDependency())));
}
rib.setListenerRegistrations(regs);
return rib;
private static final class RibImplCloseable extends RIBImpl implements AutoCloseable {
private List<ListenerRegistration<BGPSessionListener>> regs;
- private RibImplCloseable(final RibId ribId, final RIBExtensionConsumerContext extensions, final DataProviderService dps) {
- super(ribId, extensions, dps);
+ private RibImplCloseable(final RibId ribId, final AsNumber localAs, final byte[] bgpId,
+ final RIBExtensionConsumerContext extensions, final DataProviderService dps) {
+ super(ribId, localAs, bgpId, extensions, dps);
}
@Override
try {
super.close();
} finally {
- for (ListenerRegistration<BGPSessionListener> r : regs) {
+ for (final ListenerRegistration<BGPSessionListener> r : this.regs) {
r.close();
}
}
leaf as-number {
mandatory true;
- type int32;
+ type uint32;
}
}
}
}
}
+ leaf local-as {
+ description "Our local AS number. Needed by best selection path attribute.";
+ type uint32;
+ mandatory true;
+ }
+
+ leaf bgp-id {
+ description "Our local BGP identifier. Needed by best selection path attribute.";
+ mandatory true;
+ type string;
+ }
+
leaf rib-id {
type rib:rib-id;
mandatory true;
this.threadgropFactory = new NettyThreadgroupModuleFactory();
this.messageFactory = new RIBExtensionsImplModuleFactory();
this.extensionFactory = new SimpleBGPExtensionProviderContextModuleFactory();
- super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.factory, this.dispactherFactory,
- this.sessionFacotry, this.messageFactory, this.threadgropFactory, this.extensionFactory));
+ super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.factory, this.dispactherFactory, this.sessionFacotry, this.messageFactory, this.threadgropFactory, this.extensionFactory));
}
@Test
- public void testValidationExceptionPortNotSet()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionPortNotSet() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, "localhost", null, sessionFacotry.getImplementationName(),
- dispactherFactory.getImplementationName(), threadgropFactory.getImplementationName(),
- messageFactory.getImplementationName(), this.extensionFactory.getImplementationName());
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, "localhost", null,
+ this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(),
+ this.threadgropFactory.getImplementationName(), this.messageFactory.getImplementationName(),
+ this.extensionFactory.getImplementationName());
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("Port value is not set."));
}
}
@Test
- public void testValidationExceptionPortOutOfRange()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionPortOutOfRange() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, "localhost", -1, sessionFacotry.getImplementationName(), dispactherFactory.getImplementationName(), threadgropFactory.getImplementationName(), messageFactory.getImplementationName(), this.extensionFactory.getImplementationName());
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, "localhost", -1,
+ this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(),
+ this.threadgropFactory.getImplementationName(), this.messageFactory.getImplementationName(),
+ this.extensionFactory.getImplementationName());
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("is out of range (0-65535)."));
}
}
@Test
- public void testValidationExceptionHostNotSet()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionHostNotSet() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, null, 1, sessionFacotry.getImplementationName(), dispactherFactory.getImplementationName(), threadgropFactory.getImplementationName(), messageFactory.getImplementationName(), this.extensionFactory.getImplementationName());
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, null, 1,
+ this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(),
+ this.threadgropFactory.getImplementationName(), this.messageFactory.getImplementationName(),
+ this.extensionFactory.getImplementationName());
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("Host value is not set."));
}
}
@Test
public void testCreateBean() throws Exception {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, "localhost", 1, sessionFacotry.getImplementationName(), dispactherFactory.getImplementationName(), threadgropFactory.getImplementationName(), messageFactory.getImplementationName(), this.extensionFactory.getImplementationName());
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, "localhost", 1,
+ this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(),
+ this.threadgropFactory.getImplementationName(), this.messageFactory.getImplementationName(),
+ this.extensionFactory.getImplementationName());
transaction.validateConfig();
- CommitStatus status = transaction.commit();
- assertBeanCount(1, factory.getImplementationName());
+ final CommitStatus status = transaction.commit();
+ assertBeanCount(1, this.factory.getImplementationName());
assertStatus(status, 6, 0, 0);
}
@Test
- public void testReusingOldInstance() throws InstanceAlreadyExistsException,
- ConflictingVersionException, ValidationException {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, "localhost", 1, sessionFacotry.getImplementationName(), dispactherFactory.getImplementationName(), threadgropFactory.getImplementationName(), messageFactory.getImplementationName(), this.extensionFactory.getImplementationName());
+ public void testReusingOldInstance() throws InstanceAlreadyExistsException, ConflictingVersionException, ValidationException {
+ ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, "localhost", 1,
+ this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(),
+ this.threadgropFactory.getImplementationName(), this.messageFactory.getImplementationName(),
+ this.extensionFactory.getImplementationName());
transaction.commit();
- transaction = configRegistryClient.createTransaction();
- assertBeanCount(1, factory.getImplementationName());
- CommitStatus status = transaction.commit();
- assertBeanCount(1, factory.getImplementationName());
+ transaction = this.configRegistryClient.createTransaction();
+ assertBeanCount(1, this.factory.getImplementationName());
+ final CommitStatus status = transaction.commit();
+ assertBeanCount(1, this.factory.getImplementationName());
assertStatus(status, 0, 0, 6);
}
@Test
- public void testReconfigure() throws InstanceAlreadyExistsException,
- ConflictingVersionException, ValidationException,
- InstanceNotFoundException {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, "localhost", 1, sessionFacotry.getImplementationName(), dispactherFactory.getImplementationName(), threadgropFactory.getImplementationName(), messageFactory.getImplementationName(), this.extensionFactory.getImplementationName());
+ public void testReconfigure() throws InstanceAlreadyExistsException, ConflictingVersionException, ValidationException,
+ InstanceNotFoundException {
+ ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, "localhost", 1,
+ this.sessionFacotry.getImplementationName(), this.dispactherFactory.getImplementationName(),
+ this.threadgropFactory.getImplementationName(), this.messageFactory.getImplementationName(),
+ this.extensionFactory.getImplementationName());
transaction.commit();
- transaction = configRegistryClient.createTransaction();
- assertBeanCount(1, factory.getImplementationName());
- BGPImplModuleMXBean mxBean = transaction
- .newMBeanProxy(transaction.lookupConfigBean(
- factory.getImplementationName(),
- instanceName), BGPImplModuleMXBean.class);
+ transaction = this.configRegistryClient.createTransaction();
+ assertBeanCount(1, this.factory.getImplementationName());
+ final BGPImplModuleMXBean mxBean = transaction.newMBeanProxy(
+ transaction.lookupConfigBean(this.factory.getImplementationName(), this.instanceName), BGPImplModuleMXBean.class);
mxBean.setPort(10);
- CommitStatus status = transaction.commit();
- assertBeanCount(1, factory.getImplementationName());
+ final CommitStatus status = transaction.commit();
+ assertBeanCount(1, this.factory.getImplementationName());
assertStatus(status, 0, 1, 5);
}
public static ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String moduleName,
- final String instanceName, final String host, final Integer port, final String sessionModuleName, final String dispatcherModuleName, final String threadgroupModuleName, final String messageFactoryModuleName, final String extensionModuleName) throws InstanceAlreadyExistsException {
- ObjectName nameCreated = transaction.createModule(
- moduleName, instanceName);
- BGPImplModuleMXBean mxBean = transaction.newMBeanProxy(
- nameCreated, BGPImplModuleMXBean.class);
+ final String instanceName, final String host, final Integer port, final String sessionModuleName,
+ final String dispatcherModuleName, final String threadgroupModuleName, final String messageFactoryModuleName,
+ final String extensionModuleName) throws InstanceAlreadyExistsException {
+ final ObjectName nameCreated = transaction.createModule(moduleName, instanceName);
+ final BGPImplModuleMXBean mxBean = transaction.newMBeanProxy(nameCreated, BGPImplModuleMXBean.class);
mxBean.setHost(host);
mxBean.setPort(port);
- mxBean.setBgpProposal(BGPSessionProposalImplModuleTest.createInstance(transaction, sessionModuleName, "bgp-session1", 1, (short)30, "128.0.0.1"));
+ mxBean.setBgpProposal(BGPSessionProposalImplModuleTest.createInstance(transaction, sessionModuleName, "bgp-session1", 1L,
+ (short) 30, "128.0.0.1"));
mxBean.setBgpDispatcher(BGPDispatcherImplModuleTest.createInstance(transaction, dispatcherModuleName, "bgp-dispatcher1"));
return nameCreated;
}
private final String instanceName = "bgp-session-prop";
private BGPSessionProposalImplModuleFactory factory;
-
+
@Before
public void setUp() throws Exception {
this.factory = new BGPSessionProposalImplModuleFactory();
super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.factory));
}
-
+
@Test
- public void testValidationExceptionAsNumberNotSet()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionAsNumberNotSet() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, null, (short)180, "192.168.1.1");
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, null, (short) 180, "192.168.1.1");
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("AsNumber value is not set."));
}
}
-
+
@Test
- public void testValidationExceptionAsNumberMinValue()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionAsNumberMinValue() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, -1, (short)180, "192.168.1.1");
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, (long) 0, (short) 180, "192.168.1.1");
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
- assertTrue(e.getMessage().contains("AsNumber value must be greather than 0"));
+ } catch (final ValidationException e) {
+ assertTrue(e.getMessage().contains("AsNumber value must be greater than 0"));
}
}
-
+
@Test
- public void testValidationExceptionHoldtimerNotSet()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionHoldtimerNotSet() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, null, "192.168.1.1");
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, null, "192.168.1.1");
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("Holdtimer value is not set."));
}
}
-
+
@Test
- public void testValidationExceptionHoldtimerMinValue()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionHoldtimerMinValue() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, (short)2, "192.168.1.1");
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, (short) 2, "192.168.1.1");
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("Holdtimer value must be"));
}
}
-
+
@Test
- public void testValidationExceptionBgpIdNotSet()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionBgpIdNotSet() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, (short)180, null);
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, (short) 180, null);
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("BgpId value is not set."));
}
}
-
+
@Test
- public void testValidationExceptionBgpIdNotIpv4()
- throws InstanceAlreadyExistsException {
+ public void testValidationExceptionBgpIdNotIpv4() throws InstanceAlreadyExistsException {
try {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, (short)180, "192.168.1.500");
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, (short) 180, "192.168.1.500");
transaction.validateConfig();
fail();
- } catch (ValidationException e) {
+ } catch (final ValidationException e) {
assertTrue(e.getMessage().contains("is not valid IPv4 address"));
}
}
-
+
@Test
public void testCreateBean() throws Exception {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, (short)180, "192.168.1.1");
+ final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, (short) 180, "192.168.1.1");
transaction.validateConfig();
- CommitStatus status = transaction.commit();
- assertBeanCount(1, factory.getImplementationName());
+ final CommitStatus status = transaction.commit();
+ assertBeanCount(1, this.factory.getImplementationName());
assertStatus(status, 1, 0, 0);
}
-
+
@Test
- public void testReusingOldInstance() throws InstanceAlreadyExistsException,
- ConflictingVersionException, ValidationException {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, (short)180, "192.168.1.1");
+ public void testReusingOldInstance() throws InstanceAlreadyExistsException, ConflictingVersionException, ValidationException {
+ ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, (short) 180, "192.168.1.1");
transaction.commit();
- transaction = configRegistryClient.createTransaction();
- assertBeanCount(1, factory.getImplementationName());
- CommitStatus status = transaction.commit();
- assertBeanCount(1, factory.getImplementationName());
+ transaction = this.configRegistryClient.createTransaction();
+ assertBeanCount(1, this.factory.getImplementationName());
+ final CommitStatus status = transaction.commit();
+ assertBeanCount(1, this.factory.getImplementationName());
assertStatus(status, 0, 0, 1);
}
@Test
- public void testReconfigure() throws InstanceAlreadyExistsException,
- ConflictingVersionException, ValidationException,
+ public void testReconfigure() throws InstanceAlreadyExistsException, ConflictingVersionException, ValidationException,
InstanceNotFoundException {
- ConfigTransactionJMXClient transaction = configRegistryClient
- .createTransaction();
- createInstance(transaction, this.factory.getImplementationName(), instanceName, 1, (short)180, "192.168.1.1");
+ ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
+ createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 1L, (short) 180, "192.168.1.1");
transaction.commit();
- transaction = configRegistryClient.createTransaction();
- assertBeanCount(1, factory.getImplementationName());
- BGPSessionProposalImplModuleMXBean mxBean = transaction
- .newMBeanProxy(transaction.lookupConfigBean(
- factory.getImplementationName(),
- instanceName), BGPSessionProposalImplModuleMXBean.class);
+ transaction = this.configRegistryClient.createTransaction();
+ assertBeanCount(1, this.factory.getImplementationName());
+ final BGPSessionProposalImplModuleMXBean mxBean = transaction.newMBeanProxy(
+ transaction.lookupConfigBean(this.factory.getImplementationName(), this.instanceName),
+ BGPSessionProposalImplModuleMXBean.class);
mxBean.setBgpId("192.168.10.10");
- CommitStatus status = transaction.commit();
- assertBeanCount(1, factory.getImplementationName());
+ final CommitStatus status = transaction.commit();
+ assertBeanCount(1, this.factory.getImplementationName());
assertStatus(status, 0, 1, 0);
}
-
+
public static ObjectName createInstance(final ConfigTransactionJMXClient transaction, final String moduleName,
- final String instanceName, final Integer asNumber, final Short holdtimer, final String bgpId) throws InstanceAlreadyExistsException {
- ObjectName nameCreated = transaction.createModule(
- moduleName, instanceName);
- BGPSessionProposalImplModuleMXBean mxBean = transaction.newMBeanProxy(
- nameCreated, BGPSessionProposalImplModuleMXBean.class);
+ final String instanceName, final Long asNumber, final Short holdtimer, final String bgpId)
+ throws InstanceAlreadyExistsException {
+ final ObjectName nameCreated = transaction.createModule(moduleName, instanceName);
+ final BGPSessionProposalImplModuleMXBean mxBean = transaction.newMBeanProxy(nameCreated, BGPSessionProposalImplModuleMXBean.class);
mxBean.setAsNumber(asNumber);
mxBean.setBgpId(bgpId);
mxBean.setHoldtimer(holdtimer);
return nameCreated;
-
+
}
}
*/
package org.opendaylight.protocol.bgp.rib.impl;
+import java.util.Arrays;
import java.util.Comparator;
+import java.util.List;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.PathAttributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.as.path.Segments;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.AListCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.ASetCase;
+
+import com.google.common.annotations.VisibleForTesting;
/**
* This comparator is intended to implement BGP Best Path Selection algorithm, as described at
* @param <T> Actual object state reference
*/
final class BGPObjectComparator implements Comparator<PathAttributes> {
- public static final BGPObjectComparator INSTANCE = new BGPObjectComparator();
- private BGPObjectComparator() {
+ private final AsNumber ourAS;
+
+ private final byte[] id1;
+
+ private final byte[] id2;
+
+ public BGPObjectComparator(final AsNumber ourAs, final byte[] id1, final byte[] id2) {
+ this.ourAS = ourAs;
+ this.id1 = id1;
+ this.id2 = id2;
}
@Override
if (o2 == null) {
return -1;
}
- if (o1.equals(o2)) {
+ if (o1.equals(o2) && Arrays.equals(this.id1, this.id2)) {
return 0;
}
+ // 1. prefer path with accessible nexthop
+ // - we assume that all nexthops are accessible
+
+ // 2. prefer path with higher LOCAL_PREF
+ if (!o1.getLocalPref().equals(o2.getLocalPref())) {
+ return o1.getLocalPref().getPref().compareTo(o2.getLocalPref().getPref());
+ }
+
+ // 3. prefer learned path
+ // - we assume that all paths are learned
+
+ // 4. prefer the path with the shortest AS_PATH.
+ if (!o1.getAsPath().equals(o2.getAsPath())) {
+ final Integer i1 = countAsPath(o1.getAsPath().getSegments());
+ final Integer i2 = countAsPath(o2.getAsPath().getSegments());
+ return i2.compareTo(i1);
+ }
+
+ // 5. prefer the path with the lowest origin type
+ // - IGP is lower than Exterior Gateway Protocol (EGP), and EGP is lower than INCOMPLETE
+ if (!o1.getOrigin().equals(o2.getOrigin())) {
+ if (o1.getOrigin().getValue().equals(BgpOrigin.Igp)) {
+ return 1;
+ }
+ if (o2.getOrigin().getValue().equals(BgpOrigin.Igp)) {
+ return -1;
+ }
+ if (o1.getOrigin().getValue().equals(BgpOrigin.Egp)) {
+ return 1;
+ } else {
+ return -1;
+ }
+ }
+
+ // 6. prefer the path with the lowest multi-exit discriminator (MED)
+ if (!o1.getMultiExitDisc().equals(o2.getMultiExitDisc())) {
+ return o2.getMultiExitDisc().getMed().compareTo(o1.getMultiExitDisc().getMed());
+ }
+
+ // 7. prefer eBGP over iBGP paths
+ // EBGP is peering between two different AS, whereas IBGP is between same AS (Autonomous System).
+ final AsNumber first = getPeerAs(o1.getAsPath().getSegments());
+ final AsNumber second = getPeerAs(o2.getAsPath().getSegments());
+ if ((first != null || second != null) && (first != null && !first.equals(second))) {
+ if (first == null || first.equals(this.ourAS)) {
+ return -1;
+ }
+ if (second == null || second.equals(this.ourAS)) {
+ return 1;
+ }
+ }
+
+ // 8. Prefer the path with the lowest IGP metric to the BGP next hop.
+ // - no next hop metric is advertized
+
+ // 9. When both paths are external, prefer the path that was received first (the oldest one).
+ // if (first.equals(this.ourAS) && second.equals(this.ourAS)) {
+ // FIXME: do we have a way how to determine which one was received first?
+ // }
+
+ // 10. Prefer the route that comes from the BGP router with the lowest router ID.
+ // The router ID is the highest IP address on the router, with preference given to loopback addresses.
+ // If a path contains route reflector (RR) attributes, the originator ID is substituted for the router ID in the
+ // path selection process.
+ byte[] oid1 = this.id1;
+ byte[] oid2 = this.id2;
+ if (o1.getOriginatorId() != null) {
+ oid1 = o1.getOriginatorId();
+ }
+ if (o2.getOriginatorId() != null) {
+ oid2 = o2.getOriginatorId();
+ }
+ if (!Arrays.equals(oid1, oid2)) {
+ return compareByteArrays(oid1, oid2);
+ }
+ // 11. prefer the path with the minimum cluster list length
+ int cluster1 = 0;
+ int cluster2 = 0;
+ if (o1.getClusterId() != null) {
+ cluster1 = o1.getClusterId().size();
+ }
+ if (o2.getClusterId() != null) {
+ cluster2 = o2.getClusterId().size();
+ }
+ if (cluster1 != cluster2) {
+ return ((Integer) cluster1).compareTo(cluster2);
+ }
- // FIXME: BUG-185: implement here
+ // 12. Prefer the path that comes from the lowest neighbor address.
+ // FIXME: do we know this?
return 0;
}
+
+ private static int countAsPath(final List<Segments> segments) {
+ // an AS_SET counts as 1, no matter how many ASs are in the set.
+ int count = 0;
+ boolean setPresent = false;
+ for (final Segments s : segments) {
+ if (s.getCSegment() instanceof ASetCase) {
+ setPresent = true;
+ } else {
+ final AListCase list = (AListCase) s.getCSegment();
+ count += list.getAList().getAsSequence().size();
+ }
+ }
+ return (setPresent) ? ++count : count;
+ }
+
+ private static AsNumber getPeerAs(final List<Segments> segments) {
+ if (segments.size() == 0) {
+ return null;
+ }
+ final AListCase first = (AListCase) segments.get(0).getCSegment();
+ return first.getAList().getAsSequence().get(0).getAs();
+ }
+
+ @VisibleForTesting
+ public static int compareByteArrays(final byte[] byteOne, final byte[] byteTwo) {
+ for (int i = 0; i < byteOne.length; i++) {
+ final int res = Byte.compare(byteOne[i], byteTwo[i]);
+ if (res != 0) {
+ return res;
+ }
+ }
+ return 0;
+ }
}
for (final BgpTableType t : session.getAdvertisedTableTypes()) {
this.tables.add(new TablesKey(t.getAfi(), t.getSafi()));
}
+ this.rib.initTables(session.getBgpId());
+
}
private void cleanup() {
import org.opendaylight.protocol.bgp.parser.BGPTerminationReason;
import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
import org.opendaylight.protocol.framework.AbstractProtocolSession;
+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.Keepalive;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.KeepaliveBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.Notify;
private final Set<BgpTableType> tableTypes;
+ private final Ipv4Address bgpId;
+
BGPSessionImpl(final Timer timer, final BGPSessionListener listener, final Channel channel, final Open remoteOpen) {
this.listener = Preconditions.checkNotNull(listener);
this.stateTimer = Preconditions.checkNotNull(timer);
}
}, this.keepAlive, TimeUnit.SECONDS);
}
+ this.bgpId = remoteOpen.getBgpIdentifier();
}
@Override
public synchronized State getState() {
return this.state;
}
+
+ public byte[] getBgpId() {
+ return this.bgpId.getValue().getBytes();
+ }
}
@Override
protected void startNegotiation() {
Preconditions.checkState(this.state == State.Idle);
- this.writeMessage(new OpenBuilder().setMyAsNumber(this.localPref.getMyAs()).setHoldTimer(this.localPref.getHoldTime()).setBgpIdentifier(
- this.localPref.getBgpId()).setBgpParameters(this.localPref.getParams()).build());
+ this.writeMessage(new OpenBuilder().setMyAsNumber(this.localPref.getMyAs().getValue().intValue()).setHoldTimer(
+ this.localPref.getHoldTime()).setBgpIdentifier(this.localPref.getBgpId()).setBgpParameters(this.localPref.getParams()).build());
this.state = State.OpenSent;
final Object lock = this;
private final short holdTimer;
- private final int as;
+ private final AsNumber as;
private final Ipv4Address bgpId;
private final BGPSessionPreferences prefs;
- public BGPSessionProposalImpl(final short holdTimer, final int as, final Ipv4Address bgpId,
+ public BGPSessionProposalImpl(final short holdTimer, final AsNumber as, final Ipv4Address bgpId,
final Map<Class<? extends AddressFamily>, Class<? extends SubsequentAddressFamily>> tables) {
this.holdTimer = holdTimer;
this.as = as;
new MultiprotocolCapabilityBuilder().setAfi(e.getKey()).setSafi(e.getValue()).build()).build()).build());
}
tlvs.add(new BgpParametersBuilder().setCParameters(
- new As4BytesCaseBuilder().setAs4BytesCapability(
- new As4BytesCapabilityBuilder().setAsNumber(new AsNumber((long) as)).build()).build()).build());
+ new As4BytesCaseBuilder().setAs4BytesCapability(new As4BytesCapabilityBuilder().setAsNumber(as).build()).build()).build());
this.prefs = new BGPSessionPreferences(as, holdTimer, bgpId, tlvs);
}
/**
* @return the as
*/
- public int getAs() {
+ public AsNumber getAs() {
return this.as;
}
import org.opendaylight.protocol.bgp.rib.DefaultRibReference;
import org.opendaylight.protocol.bgp.rib.spi.AdjRIBsIn;
import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionConsumerContext;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
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.UpdateBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.update.Nlri;
private static final Logger LOG = LoggerFactory.getLogger(RIBImpl.class);
private static final Update EOR = new UpdateBuilder().build();
private final DataProviderService dps;
- private final RIBTables tables;
+ private RIBTables tables;
+ private final RIBExtensionConsumerContext extensions;
+ private final AsNumber localAs;
+ private final byte[] localBgpId;
- public RIBImpl(final RibId ribId, final RIBExtensionConsumerContext extensions, final DataProviderService dps) {
+ public RIBImpl(final RibId ribId, final AsNumber localAs, final byte[] localBgpId, final RIBExtensionConsumerContext extensions,
+ final DataProviderService dps) {
super(InstanceIdentifier.builder(BgpRib.class).child(Rib.class, new RibKey(Preconditions.checkNotNull(ribId))).toInstance());
this.dps = Preconditions.checkNotNull(dps);
- this.tables = new RIBTables(BGPObjectComparator.INSTANCE, extensions);
+ this.extensions = extensions;
+ this.localAs = Preconditions.checkNotNull(localAs);
+ this.localBgpId = localBgpId;
LOG.debug("Instantiating RIB table {} at {}", ribId, getInstanceIdentifier());
final Object o = t.readOperationalData(getInstanceIdentifier());
Preconditions.checkState(o == null, "Data provider conflict detected on object {}", getInstanceIdentifier());
- t.putOperationalData(getInstanceIdentifier(),
+ t.putOperationalData(
+ getInstanceIdentifier(),
new RibBuilder().setKey(new RibKey(ribId)).setId(ribId).setLocRib(
- new LocRibBuilder().setTables(Collections.<Tables>emptyList()).build()).build());
+ new LocRibBuilder().setTables(Collections.<Tables> emptyList()).build()).build());
Futures.addCallback(JdkFutureAdapters.listenInPoolThread(t.commit()), new FutureCallback<RpcResult<TransactionStatus>>() {
@Override
public void onSuccess(final RpcResult<TransactionStatus> result) {
});
}
+ synchronized void initTables(final byte[] remoteBgpId) {
+ this.tables = new RIBTables(new BGPObjectComparator(this.localAs, this.localBgpId, remoteBgpId), this.extensions);
+ }
+
synchronized void updateTables(final BGPPeer peer, final Update message) {
final DataModificationTransaction trans = this.dps.beginTransaction();
peer,
new MpReachNlriBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).setCNextHop(
attrs.getCNextHop()).setAdvertizedRoutes(
- new AdvertizedRoutesBuilder().setDestinationType(
- new DestinationIpv4CaseBuilder().setDestinationIpv4(
- new DestinationIpv4Builder().setIpv4Prefixes(ar.getNlri()).build()).build()).build()).build(),
- attrs);
+ new AdvertizedRoutesBuilder().setDestinationType(
+ new DestinationIpv4CaseBuilder().setDestinationIpv4(
+ new DestinationIpv4Builder().setIpv4Prefixes(ar.getNlri()).build()).build()).build()).build(),
+ attrs);
} else {
LOG.debug("Not adding objects from unhandled IPv4 Unicast");
}
@Override
public void close() throws InterruptedException, ExecutionException {
- final DataModificationTransaction t = dps.beginTransaction();
+ final DataModificationTransaction t = this.dps.beginTransaction();
t.removeOperationalData(getInstanceIdentifier());
t.commit().get();
}
import java.util.List;
+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.BgpParameters;
*/
public final class BGPSessionPreferences {
- private final int as;
+ private final AsNumber as;
private final int hold;
*
* @param prefs BGP Open message
*/
- public BGPSessionPreferences(final int as, final int hold, final Ipv4Address bgpId, final List<BgpParameters> params) {
+ public BGPSessionPreferences(final AsNumber as, final int hold, final Ipv4Address bgpId, final List<BgpParameters> params) {
this.as = as;
this.hold = hold;
this.bgpId = bgpId;
*
* @return AS number
*/
- public int getMyAs() {
+ public AsNumber getMyAs() {
return this.as;
}
import org.junit.Test;
import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
public class ApiTest {
@Test
public void testBGPSessionPreferences() {
- final BGPSessionPreferences sp = new BGPSessionPreferences(58, (short) 5, null, null);
+ final BGPSessionPreferences sp = new BGPSessionPreferences(new AsNumber(58L), (short) 5, null, null);
assertNull(sp.getBgpId());
assertEquals((short) 5, sp.getHoldTime());
- assertEquals(58, sp.getMyAs());
+ assertEquals(new AsNumber(58L), sp.getMyAs());
}
}
import org.opendaylight.protocol.framework.NeverReconnectStrategy;
import org.opendaylight.protocol.framework.ReconnectStrategy;
import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.open.BgpParameters;
public class BGPImplTest {
@Test
public void testBgpImpl() throws Exception {
- doReturn(new BGPSessionPreferences(0, 0, null, Collections.<BgpParameters> emptyList())).when(this.prop).getProposal();
+ doReturn(new BGPSessionPreferences(new AsNumber(0L), 0, null, Collections.<BgpParameters> emptyList())).when(this.prop).getProposal();
this.bgp = new BGPImpl(this.disp, new InetSocketAddress(InetAddress.getLoopbackAddress(), 2000), this.prop);
- final ListenerRegistration<?> reg = this.bgp.registerUpdateListener(new SimpleSessionListener(),
- new ReconnectStrategyFactory() {
+ final ListenerRegistration<?> reg = this.bgp.registerUpdateListener(new SimpleSessionListener(), new ReconnectStrategyFactory() {
@Override
public ReconnectStrategy createReconnectStrategy() {
return new NeverReconnectStrategy(GlobalEventExecutor.INSTANCE, 5000);
--- /dev/null
+/*
+ * 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.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.PathAttributes;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.AsPathBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.LocalPrefBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.MultiExitDiscBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.OriginBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.as.path.Segments;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.path.attributes.as.path.SegmentsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.update.PathAttributesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpOrigin;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.AListCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.ASetCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.AListBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.a.list.AsSequence;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.list._case.a.list.AsSequenceBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.as.path.segment.c.segment.a.set._case.ASetBuilder;
+
+import com.google.common.collect.Lists;
+
+/**
+ * @see <a href="http://www.cisco.com/c/en/us/support/docs/ip/border-gateway-protocol-bgp/13753-25.html">BGP Best Path
+ * Selection</a>
+ */
+public class BestPathSelectionTest {
+
+ private final BGPObjectComparator comparator = new BGPObjectComparator(new AsNumber(40L), new byte[] { (byte) 192, (byte) 150, 20, 38 }, new byte[] {
+ (byte) 192, (byte) 150, 20, 38 });
+
+ private PathAttributes attr1;
+ private PathAttributes attr2;
+ private PathAttributes attr3;
+ private PathAttributes attr4;
+ private PathAttributes attr5;
+ private PathAttributes attr6;
+ private PathAttributes attr7;
+
+ @Before
+ public void setUp() {
+ final AsPathBuilder asBuilder1 = new AsPathBuilder();
+ final AsPathBuilder asBuilder2 = new AsPathBuilder();
+ List<Segments> segs = new ArrayList<>();
+ final List<AsNumber> ases = Lists.newArrayList(new AsNumber(100L), new AsNumber(30L));
+ final List<AsSequence> seqs = Lists.newArrayList(new AsSequenceBuilder().setAs(new AsNumber(50L)).build());
+ segs.add(new SegmentsBuilder().setCSegment(new AListCaseBuilder().setAList(new AListBuilder().setAsSequence(seqs).build()).build()).build());
+ asBuilder1.setSegments(segs);
+ segs = new ArrayList<>();
+ segs.add(new SegmentsBuilder().setCSegment(new AListCaseBuilder().setAList(new AListBuilder().setAsSequence(seqs).build()).build()).build());
+ segs.add(new SegmentsBuilder().setCSegment(new ASetCaseBuilder().setASet(new ASetBuilder().setAsSet(ases).build()).build()).build());
+ asBuilder2.setSegments(segs);
+
+ final List<ClusterIdentifier> clusters = new ArrayList<>();
+ clusters.add(new ClusterIdentifier(new byte[4]));
+ clusters.add(new ClusterIdentifier(new byte[4]));
+
+ final PathAttributesBuilder builder = new PathAttributesBuilder();
+ builder.setLocalPref(new LocalPrefBuilder().setPref(100L).build());
+ this.attr1 = builder.build();
+ builder.setLocalPref(new LocalPrefBuilder().setPref(230L).build());
+ builder.setAsPath(asBuilder2.build());
+ this.attr2 = builder.build();
+ builder.setAsPath(asBuilder1.build());
+ builder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Incomplete).build());
+ this.attr3 = builder.build();
+ builder.setOrigin(new OriginBuilder().setValue(BgpOrigin.Egp).build());
+ builder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(15L).build());
+ this.attr4 = builder.build();
+ builder.setMultiExitDisc(new MultiExitDiscBuilder().setMed(12L).build());
+ this.attr5 = builder.build();
+ builder.setAsPath(new AsPathBuilder().setSegments(new ArrayList<Segments>()).build());
+ builder.setClusterId(new ArrayList<ClusterIdentifier>());
+ this.attr6 = builder.build();
+ builder.setClusterId(clusters);
+ this.attr7 = builder.build();
+ }
+
+ @Test
+ public void testCompare() {
+ assertTrue(this.comparator.compare(this.attr1, this.attr2) < 0);
+ assertTrue(this.comparator.compare(this.attr2, this.attr1) > 0);
+
+ assertTrue(this.comparator.compare(this.attr2, this.attr3) < 0);
+ assertTrue(this.comparator.compare(this.attr3, this.attr2) > 0);
+
+ assertTrue(this.comparator.compare(this.attr3, this.attr4) < 0);
+ assertTrue(this.comparator.compare(this.attr4, this.attr3) > 0);
+
+ assertTrue(this.comparator.compare(this.attr4, this.attr5) < 0);
+ assertTrue(this.comparator.compare(this.attr5, this.attr4) > 0);
+
+ assertTrue(this.comparator.compare(this.attr5, this.attr6) < 0);
+ assertTrue(this.comparator.compare(this.attr6, this.attr5) > 0);
+
+ assertTrue(this.comparator.compare(this.attr6, this.attr7) < 0);
+ assertTrue(this.comparator.compare(this.attr7, this.attr6) > 0);
+ }
+
+ @Test
+ public void testByteCompare() {
+ assertTrue(BGPObjectComparator.compareByteArrays(new byte[] { (byte) 192, (byte) 150, 20, 38 }, new byte[] { (byte) 192,
+ (byte) 168, 25, 1 }) < 0);
+ assertTrue(BGPObjectComparator.compareByteArrays(new byte[] { (byte) 192, (byte) 168, 25, 1 }, new byte[] { (byte) 192, (byte) 150,
+ 20, 38 }) > 0);
+ }
+}
import org.opendaylight.protocol.bgp.parser.BGPError;
import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
import org.opendaylight.protocol.bgp.rib.impl.spi.BGPSessionPreferences;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.LinkstateAddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.LinkstateSubsequentAddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev130919.Keepalive;
tlvs.add(new BgpParametersBuilder().setCParameters(
new MultiprotocolCaseBuilder().setMultiprotocolCapability(
new MultiprotocolCapabilityBuilder().setAfi(this.linkstatett.getAfi()).setSafi(this.linkstatett.getSafi()).build()).build()).build());
- final BGPSessionPreferences prefs = new BGPSessionPreferences(30, (short) 3, null, tlvs);
+ final BGPSessionPreferences prefs = new BGPSessionPreferences(new AsNumber(30L), (short) 3, null, tlvs);
final ChannelFuture f = mock(ChannelFuture.class);
doReturn(null).when(f).addListener(any(GenericFutureListener.class));
types.add(new BgpTableTypeImpl(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class));
return types;
}
+
+ @Override
+ public byte[] getBgpId() {
+ return new byte[] { (byte) 127, 0, 0, 1 };
+ }
}, this.listener, types);
}
public Set<BgpTableType> getAdvertisedTableTypes() {
return tts;
}
+
+ @Override
+ public byte[] getBgpId() {
+ return new byte[] { (byte) 127, 0, 0, 1 };
+ }
});
} else if (!(message instanceof Keepalive)) {
listener.onMessage(null, message);
tables.put(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
tables.put(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
- final BGPSessionProposalImpl prop = new BGPSessionProposalImpl(holdTimerValue, as.getValue().intValue(), new Ipv4Address("25.25.25.2"), tables);
+ final BGPSessionProposalImpl prop = new BGPSessionProposalImpl(holdTimerValue, as, new Ipv4Address("25.25.25.2"), tables);
final BGPSessionPreferences proposal = prop.getProposal();
import org.opendaylight.protocol.framework.SessionListener;
import org.opendaylight.protocol.framework.SessionListenerFactory;
import org.opendaylight.protocol.framework.SessionNegotiatorFactory;
+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.linkstate.rev131125.LinkstateAddressFamily;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev131125.LinkstateSubsequentAddressFamily;
tables.put(Ipv4AddressFamily.class, UnicastSubsequentAddressFamily.class);
tables.put(LinkstateAddressFamily.class, LinkstateSubsequentAddressFamily.class);
- final BGPSessionPreferences prefs = new BGPSessionProposalImpl((short) 90, 72, new Ipv4Address("127.0.0.2"), tables).getProposal();
+ final BGPSessionPreferences prefs = new BGPSessionProposalImpl((short) 90, new AsNumber(72L), new Ipv4Address("127.0.0.2"), tables).getProposal();
final SessionNegotiatorFactory<Notification, BGPSessionImpl, BGPSessionListener> snf = new BGPSessionNegotiatorFactory(new HashedWheelTimer(), prefs);
import org.opendaylight.protocol.bgp.util.HexDumpBGPFileParser;
import org.opendaylight.protocol.framework.ReconnectStrategy;
import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.AsNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@Override
public RpcResult<TransactionStatus> get(final long timeout, final TimeUnit unit) throws InterruptedException,
- ExecutionException, TimeoutException {
+ ExecutionException, TimeoutException {
return null;
}
}).when(this.mockedTransaction).commit();
final RIBExtensionProviderContext ext = new SimpleRIBExtensionProviderContext();
new RIBActivator().startRIBExtensionProvider(ext);
new org.opendaylight.protocol.bgp.linkstate.RIBActivator().startRIBExtensionProvider(ext);
- final RIBImpl rib = new RIBImpl(new RibId("testRib"), ext, this.providerService);
+ final RIBImpl rib = new RIBImpl(new RibId("testRib"), new AsNumber(72L), new byte[] { (byte) 127, 0, 0, 1 }, ext, this.providerService);
final BGPPeer peer = new BGPPeer(rib, "peer-" + this.mock.toString());
this.mock.registerUpdateListener(peer, new ReconnectStrategyFactory() {
Code Review / bgpcep.git / commitdiff