홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Gerrit Code Review
1ad75f24 1 parent 73b1277f

Modified BGP and FPM route sources to push to new route service. 

Also created an adapter to adapt the new interface to the old one for
backwards compatibilty with existing FIB components.

Change-Id: If8eb2220d9e4e69af135a8f9469ffda567ed4448
Expand all
Inline Side-by-side
Showing 13 changed files with 182 additions and 118 deletions
......@@ -18,6 +18,7 @@ package org.onosproject.routing;
/**
* A source of route updates.
*/
@Deprecated
public interface RouteSourceService {
/**
......
......@@ -16,6 +16,7 @@
package org.onosproject.routing.bgp;
import org.onlab.packet.IpPrefix;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.routing.RouteUpdate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -45,15 +46,16 @@ class BgpRouteSelector {
* Processes route entry updates: added/updated and deleted route
* entries.
*
* @param bgpSession the BGP session the route entry updates were
* received on
* @param addedBgpRouteEntries the added/updated route entries to process
* @param deletedBgpRouteEntries the deleted route entries to process
*/
synchronized void routeUpdates(BgpSession bgpSession,
synchronized void routeUpdates(
Collection<BgpRouteEntry> addedBgpRouteEntries,
Collection<BgpRouteEntry> deletedBgpRouteEntries) {
Collection<RouteUpdate> routeUpdates = new LinkedList<>();
Collection<Route> updates = new LinkedList<>();
Collection<Route> withdraws = new LinkedList<>();
RouteUpdate routeUpdate;
if (bgpSessionManager.isShutdown()) {
......@@ -61,32 +63,42 @@ class BgpRouteSelector {
}
// Process the deleted route entries
for (BgpRouteEntry bgpRouteEntry : deletedBgpRouteEntries) {
routeUpdate = processDeletedRoute(bgpSession, bgpRouteEntry);
if (routeUpdate != null) {
routeUpdates.add(routeUpdate);
}
routeUpdate = processDeletedRoute(bgpRouteEntry);
convertRouteUpdateToRoute(routeUpdate, updates, withdraws);
}
// Process the added/updated route entries
for (BgpRouteEntry bgpRouteEntry : addedBgpRouteEntries) {
routeUpdate = processAddedRoute(bgpSession, bgpRouteEntry);
if (routeUpdate != null) {
routeUpdates.add(routeUpdate);
routeUpdate = processAddedRoute(bgpRouteEntry);
convertRouteUpdateToRoute(routeUpdate, updates, withdraws);
}
bgpSessionManager.withdraw(withdraws);
bgpSessionManager.update(updates);
}
private void convertRouteUpdateToRoute(RouteUpdate routeUpdate,
Collection<Route> updates,
Collection<Route> withdraws) {
if (routeUpdate != null) {
Route route = new Route(Route.Source.BGP, routeUpdate.routeEntry().prefix(),
routeUpdate.routeEntry().nextHop());
if (routeUpdate.type().equals(RouteUpdate.Type.UPDATE)) {
updates.add(route);
} else if (routeUpdate.type().equals(RouteUpdate.Type.DELETE)) {
withdraws.add(route);
}
}
bgpSessionManager.getRouteListener().update(routeUpdates);
}
/**
* Processes an added/updated route entry.
*
* @param bgpSession the BGP session the route entry update was received on
* @param bgpRouteEntry the added/updated route entry
* @return the result route update that should be forwarded to the
* Route Listener, or null if no route update should be forwarded
*/
private RouteUpdate processAddedRoute(BgpSession bgpSession,
BgpRouteEntry bgpRouteEntry) {
private RouteUpdate processAddedRoute(BgpRouteEntry bgpRouteEntry) {
RouteUpdate routeUpdate;
BgpRouteEntry bestBgpRouteEntry =
bgpSessionManager.findBgpRoute(bgpRouteEntry.prefix());
......@@ -136,13 +148,11 @@ class BgpRouteSelector {
/**
* Processes a deleted route entry.
*
* @param bgpSession the BGP session the route entry update was received on
* @param bgpRouteEntry the deleted route entry
* @return the result route update that should be forwarded to the
* Route Listener, or null if no route update should be forwarded
*/
private RouteUpdate processDeletedRoute(BgpSession bgpSession,
BgpRouteEntry bgpRouteEntry) {
private RouteUpdate processDeletedRoute(BgpRouteEntry bgpRouteEntry) {
RouteUpdate routeUpdate;
BgpRouteEntry bestBgpRouteEntry =
bgpSessionManager.findBgpRoute(bgpRouteEntry.prefix());
......
......@@ -327,6 +327,7 @@ public class BgpSession extends SimpleChannelHandler {
ctx.getChannel().getRemoteAddress(),
ctx.getChannel().getLocalAddress(),
e);
log.debug("Exception:", e.getCause());
processChannelDisconnected();
}
......@@ -350,8 +351,8 @@ public class BgpSession extends SimpleChannelHandler {
BgpRouteSelector bgpRouteSelector =
bgpSessionManager.getBgpRouteSelector();
Collection<BgpRouteEntry> addedRoutes = Collections.emptyList();
bgpRouteSelector.routeUpdates(this, addedRoutes, deletedRoutes4);
bgpRouteSelector.routeUpdates(this, addedRoutes, deletedRoutes6);
bgpRouteSelector.routeUpdates(addedRoutes, deletedRoutes4);
bgpRouteSelector.routeUpdates(addedRoutes, deletedRoutes6);
bgpSessionManager.peerDisconnected(this);
}
......
......@@ -19,6 +19,8 @@ import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Modified;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.Channel;
......@@ -34,8 +36,8 @@ import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip4Prefix;
import org.onlab.packet.Ip6Prefix;
import org.onlab.packet.IpPrefix;
import org.onosproject.routing.RouteSourceService;
import org.onosproject.routing.RouteListener;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
......@@ -48,7 +50,6 @@ import java.util.Dictionary;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.concurrent.Executors.newCachedThreadPool;
import static org.onlab.util.Tools.groupedThreads;
......@@ -57,10 +58,13 @@ import static org.onlab.util.Tools.groupedThreads;
*/
@Component(immediate = true, enabled = false)
@Service
public class BgpSessionManager implements BgpInfoService, RouteSourceService {
public class BgpSessionManager implements BgpInfoService {
private static final Logger log =
LoggerFactory.getLogger(BgpSessionManager.class);
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected RouteAdminService routeService;
boolean isShutdown = true;
private Channel serverChannel; // Listener for incoming BGP connections
private ServerBootstrap serverBootstrap;
......@@ -75,19 +79,19 @@ public class BgpSessionManager implements BgpInfoService, RouteSourceService {
private ConcurrentMap<Ip6Prefix, BgpRouteEntry> bgpRoutes6 =
new ConcurrentHashMap<>();
private RouteListener routeListener;
private static final int DEFAULT_BGP_PORT = 2000;
private int bgpPort;
@Activate
protected void activate(ComponentContext context) {
readComponentConfiguration(context);
start();
log.info("BgpSessionManager started");
}
@Deactivate
protected void deactivate() {
stop();
log.info("BgpSessionManager stopped");
}
......@@ -128,15 +132,6 @@ public class BgpSessionManager implements BgpInfoService, RouteSourceService {
}
/**
* Gets the route listener.
*
* @return the route listener to use
*/
RouteListener getRouteListener() {
return routeListener;
}
/**
* Gets the BGP sessions.
*
* @return the BGP sessions
......@@ -290,13 +285,29 @@ public class BgpSessionManager implements BgpInfoService, RouteSourceService {
return bgpRouteSelector;
}
@Override
public void start(RouteListener routeListener) {
/**
* Sends updates routes to the route service.
*
* @param updates routes to update
*/
void update(Collection<Route> updates) {
routeService.update(updates);
}
/**
* Sends withdrawn routes to the routes service.
*
* @param withdraws routes to withdraw
*/
void withdraw(Collection<Route> withdraws) {
routeService.withdraw(withdraws);
}
public void start() {
log.debug("BGP Session Manager start.");
isShutdown = false;
this.routeListener = checkNotNull(routeListener);
ChannelFactory channelFactory = new NioServerSocketChannelFactory(
newCachedThreadPool(groupedThreads("onos/bgp", "sm-boss-%d")),
newCachedThreadPool(groupedThreads("onos/bgp", "sm-worker-%d")));
......@@ -330,7 +341,6 @@ public class BgpSessionManager implements BgpInfoService, RouteSourceService {
}
}
@Override
public void stop() {
isShutdown = true;
allChannels.close().awaitUninterruptibly();
......
......@@ -154,10 +154,10 @@ final class BgpUpdate {
//
BgpRouteSelector bgpRouteSelector =
bgpSession.getBgpSessionManager().getBgpRouteSelector();
bgpRouteSelector.routeUpdates(bgpSession,
bgpRouteSelector.routeUpdates(
decodedBgpRoutes.addedUnicastRoutes4.values(),
decodedBgpRoutes.deletedUnicastRoutes4.values());
bgpRouteSelector.routeUpdates(bgpSession,
bgpRouteSelector.routeUpdates(
decodedBgpRoutes.addedUnicastRoutes6.values(),
decodedBgpRoutes.deletedUnicastRoutes6.values());
......
......@@ -15,18 +15,10 @@
*/
package org.onosproject.routing.config.impl;
import static org.onosproject.routing.RouteEntry.createBinaryString;
import com.google.common.collect.ImmutableSet;
import com.googlecode.concurrenttrees.radix.node.concrete.DefaultByteArrayNodeFactory;
import com.googlecode.concurrenttrees.radixinverted.ConcurrentInvertedRadixTree;
import com.googlecode.concurrenttrees.radixinverted.InvertedRadixTree;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
......@@ -48,15 +40,22 @@ import org.onosproject.net.config.NetworkConfigListener;
import org.onosproject.net.config.NetworkConfigRegistry;
import org.onosproject.net.config.NetworkConfigService;
import org.onosproject.net.config.basics.SubjectFactories;
import org.onosproject.routing.RoutingService;
import org.onosproject.routing.config.BgpConfig;
import org.onosproject.routing.config.LocalIpPrefixEntry;
import org.onosproject.routing.config.ReactiveRoutingConfig;
import org.onosproject.routing.config.RouterConfig;
import org.onosproject.routing.config.RoutingConfigurationService;
import org.onosproject.routing.impl.Router;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import static org.onosproject.routing.RouteEntry.createBinaryString;
/**
* Implementation of RoutingConfigurationService which reads routing
* configuration from a file.
......@@ -165,7 +164,7 @@ public class RoutingConfigurationImpl implements RoutingConfigurationService {
virtualGatewayMacAddress = config.virtualGatewayMacAddress();
// Setup BGP peer connect points
ApplicationId routerAppId = coreService.getAppId(Router.ROUTER_APP_ID);
ApplicationId routerAppId = coreService.getAppId(RoutingService.ROUTER_APP_ID);
if (routerAppId == null) {
log.info("Router application ID is null!");
return;
......
......@@ -15,6 +15,7 @@
*/
package org.onosproject.routing.fpm;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
......@@ -38,10 +39,8 @@ import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.util.Tools;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.routing.RouteEntry;
import org.onosproject.routing.RouteListener;
import org.onosproject.routing.RouteSourceService;
import org.onosproject.routing.RouteUpdate;
import org.onosproject.incubator.net.routing.Route;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.onosproject.routing.fpm.protocol.FpmHeader;
import org.onosproject.routing.fpm.protocol.Netlink;
import org.onosproject.routing.fpm.protocol.RouteAttribute;
......@@ -55,12 +54,11 @@ import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Collections;
import java.util.Dictionary;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import static java.util.concurrent.Executors.newCachedThreadPool;
import static org.onlab.util.Tools.groupedThreads;
......@@ -70,7 +68,7 @@ import static org.onlab.util.Tools.groupedThreads;
*/
@Service
@Component(immediate = true, enabled = false)
public class FpmManager implements RouteSourceService, FpmInfoService {
public class FpmManager implements FpmInfoService {
private final Logger log = LoggerFactory.getLogger(getClass());
private static final int FPM_PORT = 2620;
......@@ -78,15 +76,16 @@ public class FpmManager implements RouteSourceService, FpmInfoService {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ComponentConfigService componentConfigService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected RouteAdminService routeService;
private ServerBootstrap serverBootstrap;
private Channel serverChannel;
private ChannelGroup allChannels = new DefaultChannelGroup();
private Map<SocketAddress, Long> peers = new ConcurrentHashMap<>();
private Map<IpPrefix, RouteEntry> fpmRoutes = new ConcurrentHashMap<>();
private RouteListener routeListener;
private Map<IpPrefix, Route> fpmRoutes = new ConcurrentHashMap<>();
@Property(name = "clearRoutes", boolValue = true,
label = "Whether to clear routes when the FPM connection goes down")
......@@ -96,12 +95,14 @@ public class FpmManager implements RouteSourceService, FpmInfoService {
protected void activate(ComponentContext context) {
componentConfigService.registerProperties(getClass());
modified(context);
startServer();
log.info("Started");
}
@Deactivate
protected void deactivate() {
stopServer();
fpmRoutes.clear();
componentConfigService.unregisterProperties(getClass(), false);
log.info("Stopped");
}
......@@ -165,19 +166,6 @@ public class FpmManager implements RouteSourceService, FpmInfoService {
}
}
@Override
public void start(RouteListener routeListener) {
this.routeListener = routeListener;
startServer();
}
@Override
public void stop() {
fpmRoutes.clear();
stopServer();
}
private void fpmMessage(FpmHeader fpmMessage) {
Netlink netlink = fpmMessage.netlink();
RtNetlink rtNetlink = netlink.rtNetlink();
......@@ -212,51 +200,46 @@ public class FpmManager implements RouteSourceService, FpmInfoService {
IpPrefix prefix = IpPrefix.valueOf(dstAddress, rtNetlink.dstLength());
RouteUpdate routeUpdate = null;
RouteEntry entry;
List<Route> updates = new LinkedList<>();
List<Route> withdraws = new LinkedList<>();
Route route;
switch (netlink.type()) {
case RTM_NEWROUTE:
if (gateway == null) {
// We ignore interface routes with no gateway for now.
return;
}
entry = new RouteEntry(prefix, gateway);
route = new Route(Route.Source.FPM, prefix, gateway);
fpmRoutes.put(entry.prefix(), entry);
fpmRoutes.put(prefix, route);
routeUpdate = new RouteUpdate(RouteUpdate.Type.UPDATE, entry);
updates.add(route);
break;
case RTM_DELROUTE:
RouteEntry existing = fpmRoutes.remove(prefix);
Route existing = fpmRoutes.remove(prefix);
if (existing == null) {
log.warn("Got delete for non-existent prefix");
return;
}
entry = new RouteEntry(prefix, existing.nextHop());
route = new Route(Route.Source.FPM, prefix, existing.nextHop());
routeUpdate = new RouteUpdate(RouteUpdate.Type.DELETE, entry);
withdraws.add(route);
break;
case RTM_GETROUTE:
default:
break;
}
if (routeUpdate == null) {
log.warn("Unsupported FPM message: {}", fpmMessage);
return;
}
routeListener.update(Collections.singletonList(routeUpdate));
routeService.withdraw(withdraws);
routeService.update(updates);
}
private void clearRoutes() {
log.info("Clearing all routes");
List<RouteUpdate> routeUpdates = fpmRoutes.values().stream()
.map(routeEntry -> new RouteUpdate(RouteUpdate.Type.DELETE, routeEntry))
.collect(Collectors.toList());
routeListener.update(routeUpdates);
routeService.withdraw(ImmutableList.copyOf(fpmRoutes.values()));
}
@Override
......
......@@ -33,8 +33,7 @@ import org.onlab.junit.TestUtils;
import org.onlab.junit.TestUtils.TestUtilsException;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip4Prefix;
import org.onosproject.routing.RouteListener;
import org.onosproject.routing.RouteUpdate;
import org.onosproject.incubator.net.routing.RouteAdminService;
import org.osgi.service.component.ComponentContext;
import java.net.InetAddress;
......@@ -48,6 +47,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.hasSize;
......@@ -85,6 +85,8 @@ public class BgpSessionManagerTest {
// Timeout waiting for a message to be received
private static final int MESSAGE_TIMEOUT_MS = 5000; // 5s
private RouteAdminService routeService;
// The BGP Session Manager to test
private BgpSessionManager bgpSessionManager;
......@@ -102,19 +104,6 @@ public class BgpSessionManagerTest {
// The socket that the remote peers should connect to
private InetSocketAddress connectToSocket;
private final DummyRouteListener dummyRouteListener =
new DummyRouteListener();
/**
* Dummy implementation for the RouteListener interface.
*/
private class DummyRouteListener implements RouteListener {
@Override
public void update(Collection<RouteUpdate> routeUpdate) {
// Nothing to do
}
}
/**
* A class to capture the state for a BGP peer.
*/
......@@ -238,13 +227,11 @@ public class BgpSessionManagerTest {
}
@SuppressWarnings("unchecked")
private Dictionary
getDictionaryMock(ComponentContext componentContext) {
private void getDictionaryMock(ComponentContext componentContext) {
Dictionary dictionary = createMock(Dictionary.class);
expect(dictionary.get("bgpPort")).andReturn("0");
replay(dictionary);
expect(componentContext.getProperties()).andReturn(dictionary);
return dictionary;
}
@Before
......@@ -262,12 +249,16 @@ public class BgpSessionManagerTest {
// connections.
//
bgpSessionManager = new BgpSessionManager();
routeService = createNiceMock(RouteAdminService.class);
replay(routeService);
bgpSessionManager.routeService = routeService;
// NOTE: We use port 0 to bind on any available port
ComponentContext componentContext = createMock(ComponentContext.class);
Dictionary dictionary = getDictionaryMock(componentContext);
getDictionaryMock(componentContext);
replay(componentContext);
bgpSessionManager.activate(componentContext);
bgpSessionManager.start(dummyRouteListener);
// Get the port number the BGP Session Manager is listening on
Channel serverChannel = TestUtils.getField(bgpSessionManager,
......@@ -547,6 +538,7 @@ public class BgpSessionManagerTest {
withdrawnRoutes.add(Ip4Prefix.valueOf("70.0.0.0/16"));
withdrawnRoutes.add(Ip4Prefix.valueOf("80.0.0.0/24"));
withdrawnRoutes.add(Ip4Prefix.valueOf("90.0.0.0/32"));
// Write the routes
message = peer1.peerChannelHandler.prepareBgpUpdate(
NEXT_HOP1_ROUTER,
......
......@@ -39,7 +39,7 @@ import org.onosproject.net.host.HostListener;
import org.onosproject.net.host.HostService;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.routing.config.RoutingConfigurationService;
import org.onosproject.routing.impl.Router.InternalHostListener;
import org.onosproject.routing.impl.DefaultRouter.InternalHostListener;
import org.onosproject.routing.RouteSourceService;
import org.onosproject.routing.FibEntry;
import org.onosproject.routing.FibListener;
......@@ -74,7 +74,7 @@ public class RouterAsyncArpTest {
DeviceId.deviceId("of:0000000000000003"),
PortNumber.portNumber(1));
private Router router;
private DefaultRouter router;
private InternalHostListener internalHostListener;
@Before
......@@ -90,7 +90,7 @@ public class RouterAsyncArpTest {
fibListener = createMock(FibListener.class);
router = new Router();
router = new DefaultRouter();
router.coreService = createNiceMock(CoreService.class);
router.hostService = hostService;
router.routingConfigurationService = routingConfigurationService;
......
......@@ -90,7 +90,7 @@ public class RouterTest {
private static final ConnectPoint SW6_ETH1 = new ConnectPoint(
DeviceId.deviceId("of:0000000000000006"),
PortNumber.portNumber(1));
private Router router;
private DefaultRouter router;
@Before
public void setUp() throws Exception {
......@@ -105,7 +105,7 @@ public class RouterTest {
fibListener = createMock(FibListener.class);
router = new Router();
router = new DefaultRouter();
router.coreService = createNiceMock(CoreService.class);
router.hostService = hostService;
router.routingConfigurationService = routingConfigurationService;
......
/*
* Copyright 2016-present Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.incubator.net.routing;
import org.onlab.packet.IpAddress;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
/**
* Adapter class for the route service.
*/
public class RouteServiceAdapter implements RouteAdminService {
@Override
public void update(Collection<Route> routes) {
}
@Override
public void withdraw(Collection<Route> routes) {
}
@Override
public Map<RouteTableId, Collection<Route>> getAllRoutes() {
return null;
}
@Override
public Route longestPrefixMatch(IpAddress ip) {
return null;
}
@Override
public Collection<Route> getRoutesForNextHop(IpAddress nextHop) {
return null;
}
@Override
public Set<NextHop> getNextHops() {
return null;
}
@Override
public void addListener(RouteListener listener) {
}
@Override
public void removeListener(RouteListener listener) {
}
}