*/
package org.opendaylight.controller.config.yang.bgp.rib.impl;
-import com.google.common.base.Charsets;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.net.InetAddresses;
+import io.netty.channel.epoll.Epoll;
import io.netty.util.concurrent.Future;
import java.net.InetSocketAddress;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.opendaylight.controller.config.api.JmxAttributeValidationException;
import org.opendaylight.protocol.bgp.openconfig.spi.BGPConfigModuleTracker;
import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenConfigProvider;
import org.opendaylight.protocol.bgp.openconfig.spi.BGPOpenconfigMapper;
import org.opendaylight.protocol.bgp.openconfig.spi.InstanceConfigurationIdentifier;
import org.opendaylight.protocol.bgp.openconfig.spi.pojo.BGPPeerInstanceConfiguration;
+import org.opendaylight.protocol.bgp.parser.BgpTableTypeImpl;
+import org.opendaylight.protocol.bgp.parser.spi.MultiprotocolCapabilitiesUtil;
import org.opendaylight.protocol.bgp.rib.impl.BGPPeer;
import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry;
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.RIB;
+import org.opendaylight.protocol.concepts.KeyMapping;
import org.opendaylight.protocol.util.Ipv6Util;
-import org.opendaylight.tcpmd5.api.KeyMapping;
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.IpAddress;
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.multiprotocol.rev130919.BgpTableType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.CParameters1;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.CParameters1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.open.bgp.parameters.optional.capabilities.c.parameters.GracefulRestartCapabilityBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.open.bgp.parameters.optional.capabilities.c.parameters.MultiprotocolCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.AddPathCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.GracefulRestartCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.MultiprotocolCapabilityBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.mp.capabilities.add.path.capability.AddressFamilies;
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.controller.tcpmd5.cfg.rev140427.Rfc2385Key;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Override
protected void customValidation() {
- JmxAttributeValidationException.checkNotNull(getHost(), "value is not set.", hostJmxAttribute);
- JmxAttributeValidationException.checkNotNull(getPort(), "value is not set.", portJmxAttribute);
-
- if (getOptionaPassword(getPassword()).isPresent()) {
- /*
- * This is a nasty hack, but we don't have another clean solution. We cannot allow
- * password being set if the injected dispatcher does not have the optional
- * md5-server-channel-factory set.
- *
- * FIXME: this is a use case for Module interfaces, e.g. RibImplModule
- * should something like isMd5ServerSupported()
- */
-
- final RIBImplModuleMXBean ribProxy = this.dependencyResolver.newMXBeanProxy(getRib(), RIBImplModuleMXBean.class);
- final BGPDispatcherImplModuleMXBean bgpDispatcherProxy = this.dependencyResolver.newMXBeanProxy(
- ribProxy.getBgpDispatcher(), BGPDispatcherImplModuleMXBean.class);
- final boolean isMd5Supported = bgpDispatcherProxy.getMd5ChannelFactory() != null;
+ final IpAddress host = getHost();
+ JmxAttributeValidationException.checkNotNull(host, "value is not set.", hostJmxAttribute);
+ JmxAttributeValidationException.checkCondition(host.getIpv4Address() != null || host.getIpv6Address() != null,
+ "Unexpected host", hostJmxAttribute);
- JmxAttributeValidationException.checkCondition(isMd5Supported,
- "Underlying dispatcher does not support MD5 clients", passwordJmxAttribute);
-
- }
+ JmxAttributeValidationException.checkNotNull(getPort(), "value is not set.", portJmxAttribute);
if (getPeerRole() != null) {
final boolean isNotPeerRoleInternal= getPeerRole() != PeerRole.Internal;
JmxAttributeValidationException.checkCondition(isNotPeerRoleInternal,
"Internal Peer Role is reserved for Application Peer use.", peerRoleJmxAttribute);
}
+
+ if (getOptionalPassword(getPassword()).isPresent()) {
+ JmxAttributeValidationException.checkCondition(Epoll.isAvailable(),
+ "BGP Peer is configured with password but native transport is not available", passwordJmxAttribute);
+ }
+
}
private InetSocketAddress createAddress() {
final AsNumber remoteAs = getAsOrDefault(r);
final BGPSessionPreferences prefs = new BGPSessionPreferences(r.getLocalAs(), getHoldtimer(), r.getBgpIdentifier(), remoteAs, tlvs);
final BGPPeer bgpClientPeer;
-
+ final IpAddress host = getNormalizedHost();
if (getPeerRole() != null) {
- bgpClientPeer = new BGPPeer(peerName(getHostWithoutValue()), r, getPeerRole());
+ bgpClientPeer = new BGPPeer(peerName(host), r, getPeerRole(), getSimpleRoutingPolicy(), getRpcRegistryDependency());
} else {
- bgpClientPeer = new BGPPeer(peerName(getHostWithoutValue()), r, PeerRole.Ibgp);
+ bgpClientPeer = new BGPPeer(peerName(host), r, PeerRole.Ibgp, getSimpleRoutingPolicy(), getRpcRegistryDependency());
}
bgpClientPeer.registerRootRuntimeBean(getRootRuntimeBeanRegistratorWrapper());
- getPeerRegistryBackwards().addPeer(getHostWithoutValue(), bgpClientPeer, prefs);
+ getPeerRegistryBackwards().addPeer(host, bgpClientPeer, prefs);
final BGPPeerModuleTracker moduleTracker = new BGPPeerModuleTracker(r.getOpenConfigProvider());
moduleTracker.onInstanceCreate();
@Override
public void close() {
bgpClientPeer.close();
- getPeerRegistryBackwards().removePeer(getHostWithoutValue());
+ getPeerRegistryBackwards().removePeer(host);
moduleTracker.onInstanceClose();
}
};
// Initiate connection
if(getInitiateConnection()) {
- final Future<Void> cf = initiateConnection(createAddress(), getOptionaPassword(getPassword()), getPeerRegistryBackwards());
+ final Future<Void> cf = initiateConnection(createAddress(), getOptionalPassword(getPassword()), getPeerRegistryBackwards());
return new CloseableNoEx() {
@Override
public void close() {
caps.add(new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder().addAugmentation(CParameters1.class,
new CParameters1Builder().setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().build()).build()).build()).build());
+ if (getRouteRefresh()) {
+ caps.add(new OptionalCapabilitiesBuilder().setCParameters(MultiprotocolCapabilitiesUtil.RR_CAPABILITY).build());
+ }
+
+ if (!getAddPathDependency().isEmpty()) {
+ final List<AddressFamilies> addPathFamilies = filterAddPathDependency(getAddPathDependency());
+ caps.add(new OptionalCapabilitiesBuilder().setCParameters(new CParametersBuilder().addAugmentation(CParameters1.class,
+ new CParameters1Builder().setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(addPathFamilies).build()).build()).build()).build());
+ }
+
for (final BgpTableType t : getAdvertizedTableDependency()) {
if (!r.getLocalTables().contains(t)) {
LOG.info("RIB instance does not list {} in its local tables. Incoming data will be dropped.", t);
return tlvs;
}
- public IpAddress getHostWithoutValue() {
- // FIXME we need to remove field "value" from IpAddress since equals does not work as expected when value being present
- // Remove after this bug is fixed https://bugs.opendaylight.org/show_bug.cgi?id=1276
- final IpAddress host = super.getHost();
- Preconditions.checkArgument(host.getIpv4Address() != null || host.getIpv6Address() != null, "Unexpected host %s", host);
- if(host.getIpv4Address() != null) {
- return new IpAddress(host.getIpv4Address());
- } else if(host.getIpv6Address() != null){
- return new IpAddress(Ipv6Util.getFullForm(host.getIpv6Address()));
+ private List<AddressFamilies> filterAddPathDependency(final List<AddressFamilies> addPathDependency) {
+ final Map<BgpTableType, AddressFamilies> filteredFamilies = new HashMap<BgpTableType, AddressFamilies>();
+ for (final AddressFamilies family : addPathDependency) {
+ final BgpTableType key = new BgpTableTypeImpl(family.getAfi(), family.getSafi());
+ if (!filteredFamilies.containsKey(key)) {
+ filteredFamilies.put(key, family);
+ } else {
+ LOG.info("Ignoring Add-path dependency {}", family);
+ }
}
- throw new IllegalArgumentException("Unexpected host " + host);
+ return new ArrayList<AddressFamilies>(filteredFamilies.values());
}
- private io.netty.util.concurrent.Future<Void> initiateConnection(final InetSocketAddress address, final Optional<Rfc2385Key> password, final BGPPeerRegistry registry) {
- KeyMapping keys = null;
- if (password.isPresent()) {
- keys = new KeyMapping();
- keys.put(address.getAddress(), password.get().getValue().getBytes(Charsets.US_ASCII));
+ public IpAddress getNormalizedHost() {
+ final IpAddress host = getHost();
+ if(host.getIpv6Address() != null){
+ return new IpAddress(Ipv6Util.getFullForm(host.getIpv6Address()));
}
+ return host;
+ }
+ private io.netty.util.concurrent.Future<Void> initiateConnection(final InetSocketAddress address, final Optional<Rfc2385Key> password, final BGPPeerRegistry registry) {
+ KeyMapping keys = KeyMapping.getKeyMapping(address.getAddress(), password);
final RIB rib = getRibDependency();
final Optional<KeyMapping> optionalKey = Optional.fromNullable(keys);
- return rib.getDispatcher().createReconnectingClient(address, registry, rib.getTcpStrategyFactory(), optionalKey);
+ return rib.getDispatcher().createReconnectingClient(address, registry, getRetrytimer(), optionalKey);
}
private BGPPeerRegistry getPeerRegistryBackwards() {
private final class BGPPeerModuleTracker implements BGPConfigModuleTracker {
private final BGPOpenconfigMapper<BGPPeerInstanceConfiguration> neighborProvider;
- private final InstanceConfigurationIdentifier identifier;
+ private final BGPPeerInstanceConfiguration bgpPeerInstanceConfiguration;
public BGPPeerModuleTracker(final Optional<BGPOpenConfigProvider> openconfigProvider) {
if (openconfigProvider.isPresent()) {
- neighborProvider = openconfigProvider.get().getOpenConfigMapper(BGPPeerInstanceConfiguration.class);
+ this.neighborProvider = openconfigProvider.get().getOpenConfigMapper(BGPPeerInstanceConfiguration.class);
} else {
- neighborProvider = null;
+ this.neighborProvider = null;
}
- identifier = new InstanceConfigurationIdentifier(getIdentifier().getInstanceName());
+ final InstanceConfigurationIdentifier identifier = new InstanceConfigurationIdentifier(getIdentifier().getInstanceName());
+ this.bgpPeerInstanceConfiguration = new BGPPeerInstanceConfiguration(identifier, Rev130715Util.getIpvAddress(getNormalizedHost()),
+ Rev130715Util.getPort(getPort().getValue()), getHoldtimer(), getPeerRole(), getInitiateConnection(),
+ getAdvertizedTableDependency(), Rev130715Util.getASNumber(getAsOrDefault(getRibDependency()).getValue()),
+ getOptionalPassword(getPassword()), getAddPathDependency());
}
@Override
public void onInstanceCreate() {
- if (neighborProvider != null) {
- neighborProvider.writeConfiguration(new BGPPeerInstanceConfiguration(identifier, Rev130715Uitl.getIpvAddress(getHostWithoutValue()),
- Rev130715Uitl.getPort(getPort().getValue()), getHoldtimer(), getPeerRole(), getInitiateConnection(),
- getAdvertizedTableDependency(), Rev130715Uitl.getASNumber(getAsOrDefault(getRibDependency()).getValue()),
- getOptionaPassword(getPassword())));
+ if (this.neighborProvider != null) {
+ this.neighborProvider.writeConfiguration(this.bgpPeerInstanceConfiguration);
}
}
@Override
public void onInstanceClose() {
- if (neighborProvider != null) {
- neighborProvider.removeConfiguration(identifier);
+ if (this.neighborProvider != null) {
+ this.neighborProvider.removeConfiguration(this.bgpPeerInstanceConfiguration);
}
}
}
- private Optional<Rfc2385Key> getOptionaPassword(Rfc2385Key password) {
+ private Optional<Rfc2385Key> getOptionalPassword(final Rfc2385Key password) {
return password != null && ! password.getValue().isEmpty() ? Optional.of(password) : Optional.<Rfc2385Key>absent();
}
-}
+}
\ No newline at end of file