Adapt FIBs to new route interface
Change-Id: I8ac19ad578aac4607fd8319186b6568a21edc1fd
diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/IntentSynchronizer.java b/apps/routing/src/main/java/org/onosproject/routing/impl/IntentSynchronizer.java
index b55bdf9..536f877 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/impl/IntentSynchronizer.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/impl/IntentSynchronizer.java
@@ -89,9 +89,9 @@
@Activate
public void activate() {
- intentsSynchronizerExecutor = createExecutor();
this.localNodeId = clusterService.getLocalNode().id();
this.appId = coreService.registerApplication(APP_NAME);
+ intentsSynchronizerExecutor = createExecutor();
leadershipService.addListener(leadershipEventListener);
leadershipService.runForLeadership(appId.name());
diff --git a/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java b/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
index 90c61f6..473450d 100644
--- a/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
+++ b/apps/routing/src/main/java/org/onosproject/routing/impl/SingleSwitchFibInstaller.java
@@ -17,9 +17,7 @@
package org.onosproject.routing.impl;
import com.google.common.collect.ConcurrentHashMultiset;
-import com.google.common.collect.HashMultimap;
import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -40,6 +38,10 @@
import org.onosproject.incubator.net.intf.InterfaceEvent;
import org.onosproject.incubator.net.intf.InterfaceListener;
import org.onosproject.incubator.net.intf.InterfaceService;
+import org.onosproject.incubator.net.routing.ResolvedRoute;
+import org.onosproject.incubator.net.routing.RouteEvent;
+import org.onosproject.incubator.net.routing.RouteListener;
+import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.config.NetworkConfigEvent;
@@ -56,24 +58,19 @@
import org.onosproject.net.flowobjective.DefaultFilteringObjective;
import org.onosproject.net.flowobjective.DefaultForwardingObjective;
import org.onosproject.net.flowobjective.DefaultNextObjective;
+import org.onosproject.net.flowobjective.DefaultObjectiveContext;
import org.onosproject.net.flowobjective.FilteringObjective;
import org.onosproject.net.flowobjective.FlowObjectiveService;
import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.flowobjective.NextObjective;
import org.onosproject.net.flowobjective.ObjectiveContext;
-import org.onosproject.net.flowobjective.DefaultObjectiveContext;
-import org.onosproject.routing.FibEntry;
-import org.onosproject.routing.FibListener;
-import org.onosproject.routing.FibUpdate;
import org.onosproject.routing.RoutingService;
import org.onosproject.routing.config.RouterConfig;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
import java.util.Dictionary;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -96,7 +93,7 @@
protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected RoutingService routingService;
+ protected RouteService routeService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected InterfaceService interfaceService;
@@ -137,11 +134,9 @@
// Mapping from next hop IP to next hop object containing group info
private final Map<IpAddress, Integer> nextHops = Maps.newHashMap();
- // Stores FIB updates that are waiting for groups to be set up
- private final Multimap<NextHopGroupKey, FibEntry> pendingUpdates = HashMultimap.create();
-
//interface object for event
private InternalInterfaceListener internalInterfaceList = new InternalInterfaceListener();
+ private InternalRouteListener routeListener = new InternalRouteListener();
@Activate
protected void activate(ComponentContext context) {
@@ -155,9 +150,6 @@
interfaceService.addListener(internalInterfaceList);
- routingService.addFibListener(new InternalFibListener());
- routingService.start();
-
updateConfig();
log.info("Started");
@@ -165,10 +157,8 @@
@Deactivate
protected void deactivate() {
- routingService.stop();
-
+ routeService.removeListener(routeListener);
deviceService.removeListener(deviceListener);
-
interfaceService.removeListener(internalInterfaceList);
//processIntfFilters(false, configService.getInterfaces()); //TODO necessary?
@@ -208,6 +198,8 @@
interfaces = routerConfig.getInterfaces();
log.info("Using interfaces: {}", interfaces.isEmpty() ? "all" : interfaces);
+ routeService.addListener(routeListener);
+
updateDevice();
}
@@ -229,55 +221,30 @@
}
}
- private void updateFibEntry(Collection<FibUpdate> updates) {
- Map<FibEntry, Integer> toInstall = new HashMap<>(updates.size());
+ private void updateRoute(ResolvedRoute route) {
+ addNextHop(route);
- for (FibUpdate update : updates) {
- FibEntry entry = update.entry();
-
- addNextHop(entry);
-
- Integer nextId;
- synchronized (pendingUpdates) {
- nextId = nextHops.get(entry.nextHopIp());
- }
-
- toInstall.put(update.entry(), nextId);
+ Integer nextId;
+ synchronized (this) {
+ nextId = nextHops.get(route.nextHop());
}
- installFlows(toInstall);
+ flowObjectiveService.forward(deviceId,
+ generateRibForwardingObj(route.prefix(), nextId).add());
+ log.trace("Sending forwarding objective {} -> nextId:{}", route, nextId);
}
- private void installFlows(Map<FibEntry, Integer> entriesToInstall) {
+ private synchronized void deleteRoute(ResolvedRoute route) {
+ //Integer nextId = nextHops.get(route.nextHop());
- for (Map.Entry<FibEntry, Integer> entry : entriesToInstall.entrySet()) {
- FibEntry fibEntry = entry.getKey();
- Integer nextId = entry.getValue();
+ /* Group group = deleteNextHop(route.prefix());
+ if (group == null) {
+ log.warn("Group not found when deleting {}", route);
+ return;
+ }*/
- flowObjectiveService.forward(deviceId,
- generateRibForwardingObj(fibEntry.prefix(), nextId).add());
- log.trace("Sending forwarding objective {} -> nextId:{}", fibEntry, nextId);
- }
-
- }
-
- private synchronized void deleteFibEntry(Collection<FibUpdate> withdraws) {
-
- for (FibUpdate update : withdraws) {
- FibEntry entry = update.entry();
- //Integer nextId = nextHops.get(entry.nextHopIp());
-
- /* Group group = deleteNextHop(entry.prefix());
- if (group == null) {
- log.warn("Group not found when deleting {}", entry);
- return;
- }*/
-
- flowObjectiveService.forward(deviceId,
- generateRibForwardingObj(entry.prefix(), null).remove());
-
- }
-
+ flowObjectiveService.forward(deviceId,
+ generateRibForwardingObj(route.prefix(), null).remove());
}
private ForwardingObjective.Builder generateRibForwardingObj(IpPrefix prefix,
@@ -306,20 +273,20 @@
return fwdBuilder;
}
- private synchronized void addNextHop(FibEntry entry) {
- prefixToNextHop.put(entry.prefix(), entry.nextHopIp());
- if (nextHopsCount.count(entry.nextHopIp()) == 0) {
+ private synchronized void addNextHop(ResolvedRoute route) {
+ prefixToNextHop.put(route.prefix(), route.nextHop());
+ if (nextHopsCount.count(route.nextHop()) == 0) {
// There was no next hop in the multiset
- Interface egressIntf = interfaceService.getMatchingInterface(entry.nextHopIp());
+ Interface egressIntf = interfaceService.getMatchingInterface(route.nextHop());
if (egressIntf == null) {
- log.warn("no egress interface found for {}", entry);
+ log.warn("no egress interface found for {}", route);
return;
}
- NextHopGroupKey groupKey = new NextHopGroupKey(entry.nextHopIp());
+ NextHopGroupKey groupKey = new NextHopGroupKey(route.nextHop());
- NextHop nextHop = new NextHop(entry.nextHopIp(), entry.nextHopMac(), groupKey);
+ NextHop nextHop = new NextHop(route.nextHop(), route.nextHopMac(), groupKey);
TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder()
.setEthSrc(egressIntf.mac())
@@ -356,12 +323,12 @@
if (routeToNextHop) {
// Install route to next hop
ForwardingObjective fob =
- generateRibForwardingObj(IpPrefix.valueOf(entry.nextHopIp(), 32), nextId).add();
+ generateRibForwardingObj(IpPrefix.valueOf(route.nextHop(), 32), nextId).add();
flowObjectiveService.forward(deviceId, fob);
}
}
- nextHopsCount.add(entry.nextHopIp());
+ nextHopsCount.add(route.nextHop());
}
/*private synchronized Group deleteNextHop(IpPrefix prefix) {
@@ -452,13 +419,21 @@
flowObjectiveService.filter(deviceId, filter);
}
- private class InternalFibListener implements FibListener {
-
+ private class InternalRouteListener implements RouteListener {
@Override
- public void update(Collection<FibUpdate> updates,
- Collection<FibUpdate> withdraws) {
- SingleSwitchFibInstaller.this.deleteFibEntry(withdraws);
- SingleSwitchFibInstaller.this.updateFibEntry(updates);
+ public void event(RouteEvent event) {
+ ResolvedRoute route = event.subject();
+ switch (event.type()) {
+ case ROUTE_ADDED:
+ case ROUTE_UPDATED:
+ updateRoute(route);
+ break;
+ case ROUTE_REMOVED:
+ deleteRoute(route);
+ break;
+ default:
+ break;
+ }
}
}
diff --git a/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java b/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
index 66de328..989b297 100644
--- a/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
+++ b/apps/routing/src/test/java/org/onosproject/routing/impl/SingleSwitchFibInstallerTest.java
@@ -15,13 +15,11 @@
*/
package org.onosproject.routing.impl;
-import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Test;
import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip4Prefix;
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
@@ -31,11 +29,14 @@
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
-import org.onosproject.core.CoreServiceAdapter;
import org.onosproject.incubator.net.intf.Interface;
import org.onosproject.incubator.net.intf.InterfaceListener;
import org.onosproject.incubator.net.intf.InterfaceService;
import org.onosproject.incubator.net.intf.InterfaceServiceAdapter;
+import org.onosproject.incubator.net.routing.ResolvedRoute;
+import org.onosproject.incubator.net.routing.RouteEvent;
+import org.onosproject.incubator.net.routing.RouteListener;
+import org.onosproject.incubator.net.routing.RouteServiceAdapter;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
@@ -53,25 +54,22 @@
import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.flowobjective.NextObjective;
import org.onosproject.net.host.InterfaceIpAddress;
-import org.onosproject.net.intent.AbstractIntentTest;
-import org.onosproject.routing.FibEntry;
-import org.onosproject.routing.FibListener;
-import org.onosproject.routing.FibUpdate;
import org.onosproject.routing.RoutingService;
-import org.onosproject.routing.RoutingServiceAdapter;
import org.onosproject.routing.config.RouterConfig;
import org.osgi.service.component.ComponentContext;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Dictionary;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
@@ -79,76 +77,68 @@
/**
* Unit tests for SingleSwitchFibInstaller.
*/
-public class SingleSwitchFibInstallerTest extends AbstractIntentTest {
+public class SingleSwitchFibInstallerTest {
- //for interface service setup
+ private static final DeviceId DEVICE_ID = DeviceId.deviceId("of:0000000000000001");
+
private static final ConnectPoint SW1_ETH1 = new ConnectPoint(
- DeviceId.deviceId("of:0000000000000001"),
- PortNumber.portNumber(1));
+ DEVICE_ID, PortNumber.portNumber(1));
- private static final ConnectPoint SW2_ETH1 = new ConnectPoint(
- DeviceId.deviceId("of:0000000000000002"),
- PortNumber.portNumber(1));
+ private static final ConnectPoint SW1_ETH2 = new ConnectPoint(
+ DEVICE_ID, PortNumber.portNumber(2));
- private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
- DeviceId.deviceId("of:0000000000000003"),
- PortNumber.portNumber(1));
+ private static final int NEXT_ID = 11;
- private static final ConnectPoint SW4_ETH1 = new ConnectPoint(
- DeviceId.deviceId("of:0000000000000004"),
- PortNumber.portNumber(1));
+ private static final VlanId VLAN1 = VlanId.vlanId((short) 1);
+ private static final MacAddress MAC1 = MacAddress.valueOf("00:00:00:00:00:01");
+ private static final MacAddress MAC2 = MacAddress.valueOf("00:00:00:00:00:02");
- private DeviceId deviceId = DeviceId.deviceId("of:0000000000000001");
+ private static final IpPrefix PREFIX1 = Ip4Prefix.valueOf("1.1.1.0/24");
+ private static final IpAddress NEXT_HOP1 = IpAddress.valueOf("192.168.10.1");
+ private static final IpAddress NEXT_HOP2 = IpAddress.valueOf("192.168.20.1");
+ private static final InterfaceIpAddress INTF1 =
+ InterfaceIpAddress.valueOf("192.168.10.2/24");
+ private static final InterfaceIpAddress INTF2 =
+ InterfaceIpAddress.valueOf("192.168.20.2/24");
+
+
private final Set<Interface> interfaces = Sets.newHashSet();
private InterfaceService interfaceService;
private NetworkConfigService networkConfigService;
private FlowObjectiveService flowObjectiveService;
private DeviceService deviceService;
- private static final ApplicationId APPID = TestApplicationId.create("update fib");
- private FibListener fibListener;
+ private static final ApplicationId APPID = TestApplicationId.create("foo");
+
+ private RouteListener routeListener;
private DeviceListener deviceListener;
- private CoreService coreService;
+
private RouterConfig routerConfig;
- private RoutingService routingService;
private SingleSwitchFibInstaller sSfibInstaller;
private InterfaceListener interfaceListener;
@Before
public void setUp() throws Exception {
- super.setUp();
sSfibInstaller = new SingleSwitchFibInstaller();
- //component config service
- ComponentConfigService mockComponenetConfigServ = EasyMock.createMock(ComponentConfigService.class);
- expect(mockComponenetConfigServ.getProperties(anyObject())).andReturn(ImmutableSet.of());
- mockComponenetConfigServ.registerProperties(sSfibInstaller.getClass());
- EasyMock.expectLastCall();
- mockComponenetConfigServ.unregisterProperties(sSfibInstaller.getClass(), false);
- EasyMock.expectLastCall();
- expect(mockComponenetConfigServ.getProperties(anyObject())).andReturn(ImmutableSet.of());
- sSfibInstaller.componentConfigService = mockComponenetConfigServ;
- replay(mockComponenetConfigServ);
+ sSfibInstaller.componentConfigService = createNiceMock(ComponentConfigService.class);
- //component context
- ComponentContext mockContext = EasyMock.createMock(ComponentContext.class);
- Dictionary properties = null;
- expect(mockContext.getProperties()).andReturn(properties);
- replay(mockContext);
+ ComponentContext mockContext = createNiceMock(ComponentContext.class);
- coreService = new TestCoreService();
- routingService = new TestRoutingService();
routerConfig = new TestRouterConfig();
- //interfaceService = createMock(InterfaceService.class);
- interfaceService = new TestInterfaceService();
+ interfaceService = createMock(InterfaceService.class);
+
networkConfigService = createMock(NetworkConfigService.class);
flowObjectiveService = createMock(FlowObjectiveService.class);
deviceService = new TestDeviceService();
+ CoreService coreService = createNiceMock(CoreService.class);
+ expect(coreService.registerApplication(anyString())).andReturn(APPID);
+ replay(coreService);
sSfibInstaller.networkConfigService = networkConfigService;
sSfibInstaller.interfaceService = interfaceService;
sSfibInstaller.flowObjectiveService = flowObjectiveService;
sSfibInstaller.coreService = coreService;
- sSfibInstaller.routingService = new TestRoutingService();
+ sSfibInstaller.routeService = new TestRouteService();
sSfibInstaller.deviceService = deviceService;
setUpNetworkConfigService();
@@ -160,48 +150,32 @@
* Sets up InterfaceService.
*/
private void setUpInterfaceService() {
- Set<InterfaceIpAddress> interfaceIpAddresses1 = Sets.newHashSet();
- interfaceIpAddresses1.add(new InterfaceIpAddress(
- IpAddress.valueOf("192.168.10.1"),
- IpPrefix.valueOf("192.168.10.0/24")));
- Interface sw1Eth1 = new Interface(SW1_ETH1.deviceId().toString(), SW1_ETH1,
- interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"),
- VlanId.NONE);
+ interfaceService.addListener(anyObject(InterfaceListener.class));
+ expectLastCall().andDelegateTo(new TestInterfaceService());
+
+ // Interface with no VLAN
+ Interface sw1Eth1 = new Interface("intf1", SW1_ETH1,
+ Collections.singletonList(INTF1), MAC1, VlanId.NONE);
+ expect(interfaceService.getMatchingInterface(NEXT_HOP1)).andReturn(sw1Eth1);
interfaces.add(sw1Eth1);
- Set<InterfaceIpAddress> interfaceIpAddresses2 = Sets.newHashSet();
- interfaceIpAddresses2.add(new InterfaceIpAddress(IpAddress.valueOf("192.168.20.1"),
- IpPrefix.valueOf("192.168.20.0/24")));
- Interface sw2Eth1 = new Interface(SW2_ETH1.deviceId().toString(), SW2_ETH1,
- interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"),
- VlanId.NONE);
+ // Interface with a VLAN
+ Interface sw2Eth1 = new Interface("intf2", SW1_ETH2,
+ Collections.singletonList(INTF2), MAC2, VLAN1);
+ expect(interfaceService.getMatchingInterface(NEXT_HOP2)).andReturn(sw2Eth1);
interfaces.add(sw2Eth1);
- Set<InterfaceIpAddress> interfaceIpAddresses3 = Sets.newHashSet();
- interfaceIpAddresses3.add(
- new InterfaceIpAddress(IpAddress.valueOf("192.168.30.101"),
- IpPrefix.valueOf("192.168.30.0/24")));
- Interface sw3Eth1 = new Interface(SW3_ETH1.deviceId().toString(), SW3_ETH1,
- interfaceIpAddresses3, MacAddress.valueOf("00:00:00:00:00:03"), VlanId.NONE);
- interfaces.add(sw3Eth1);
+ expect(interfaceService.getInterfaces()).andReturn(interfaces);
- InterfaceIpAddress interfaceIpAddress4 =
- new InterfaceIpAddress(IpAddress.valueOf("192.168.40.1"),
- IpPrefix.valueOf("192.168.40.0/24"));
-
- Interface sw4Eth1 = new Interface(SW4_ETH1.deviceId().toString(), SW4_ETH1,
- Sets.newHashSet(interfaceIpAddress4),
- MacAddress.valueOf("00:00:00:00:00:04"),
- VlanId.vlanId((short) 1));
- interfaces.add(sw4Eth1);
+ replay(interfaceService);
}
/*
* Sets up NetworkConfigService.
*/
private void setUpNetworkConfigService() {
- ApplicationId routerAppId = coreService.registerApplication(RoutingService.ROUTER_APP_ID);
- expect(networkConfigService.getConfig(routerAppId, RoutingService.ROUTER_CONFIG_CLASS)).
+ expect(networkConfigService.getConfig(
+ anyObject(ApplicationId.class), eq(RoutingService.ROUTER_CONFIG_CLASS))).
andReturn(routerConfig);
replay(networkConfigService);
}
@@ -210,41 +184,41 @@
* Sets up FlowObjectiveService.
*/
private void setUpFlowObjectiveService() {
- expect(flowObjectiveService.allocateNextId()).andReturn(11);
+ expect(flowObjectiveService.allocateNextId()).andReturn(NEXT_ID);
replay(flowObjectiveService);
}
/**
- * Tests adding a FIB entry to the flowObjectiveService.
+ * Creates a next objective with the given parameters.
*
- * We verify that the flowObjectiveService records the correct state and that the
- * correct flow is submitted to the flowObjectiveService.
+ * @param srcMac source MAC address
+ * @param dstMac destination MAC address
+ * @param port port number
+ * @param vlan vlan ID
+ * @param add whether to create an add objective or remove objective
+ * @return new next objective
*/
- @Test
- public void testFibAdd() {
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
- FibEntry fibEntry = new FibEntry(prefix,
- Ip4Address.valueOf("192.168.10.1"),
- MacAddress.valueOf("00:00:00:00:00:01"));
-
- //create the next Objective
- Interface egressIntf = interfaceService.getMatchingInterface(fibEntry.nextHopIp());
+ private NextObjective createNextObjective(MacAddress srcMac,
+ MacAddress dstMac,
+ PortNumber port,
+ VlanId vlan,
+ boolean add) {
TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder()
- .setEthSrc(MacAddress.valueOf("00:00:00:00:00:01"))
- .setEthDst(MacAddress.valueOf("00:00:00:00:00:01"));
+ .setEthSrc(srcMac)
+ .setEthDst(dstMac);
TrafficSelector.Builder metabuilder = null;
- if (!egressIntf.vlan().equals(VlanId.NONE)) {
+ if (!vlan.equals(VlanId.NONE)) {
treatment.pushVlan()
- .setVlanId(egressIntf.vlan())
- .setVlanPcp((byte) 0);
+ .setVlanId(vlan)
+ .setVlanPcp((byte) 0);
} else {
metabuilder = DefaultTrafficSelector.builder();
metabuilder.matchVlanId(VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN));
}
- treatment.setOutput(PortNumber.portNumber(1));
- int nextId = 11;
+
+ treatment.setOutput(port);
NextObjective.Builder nextBuilder = DefaultNextObjective.builder()
- .withId(nextId)
+ .withId(NEXT_ID)
.addTreatment(treatment.build())
.withType(NextObjective.Type.SIMPLE)
.fromApp(APPID);
@@ -252,10 +226,18 @@
nextBuilder.withMeta(metabuilder.build());
}
- NextObjective nextObjective = nextBuilder.add();
- flowObjectiveService.next(deviceId, nextObjective);
+ return add ? nextBuilder.add() : nextBuilder.remove();
+ }
- //set up the flowObjective
+ /**
+ * Creates a new forwarding objective with the given parameters.
+ *
+ * @param prefix IP prefix
+ * @param add whether to create an add objective or a remove objective
+ * @return new forwarding objective
+ */
+ private ForwardingObjective createForwardingObjective(IpPrefix prefix,
+ boolean add) {
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchEthType(Ethernet.TYPE_IPV4)
.matchIPDst(prefix)
@@ -269,260 +251,134 @@
.withPriority(priority)
.withFlag(ForwardingObjective.Flag.SPECIFIC);
- Integer nextId1 = 11;
- fwdBuilder.nextStep(nextId1);
- flowObjectiveService.forward(deviceId, fwdBuilder.add());
+ if (add) {
+ fwdBuilder.nextStep(NEXT_ID);
+ } else {
+ fwdBuilder.withTreatment(DefaultTrafficTreatment.builder().build());
+ }
+
+ return add ? fwdBuilder.add() : fwdBuilder.remove();
+ }
+
+ /**
+ * Tests adding a route.
+ *
+ * We verify that the flowObjectiveService records the correct state and that the
+ * correct flow is submitted to the flowObjectiveService.
+ */
+ @Test
+ public void testRouteAdd() {
+ ResolvedRoute resolvedRoute = new ResolvedRoute(PREFIX1, NEXT_HOP1, MAC1);
+
+ // Create the next objective
+ NextObjective nextObjective = createNextObjective(MAC1, MAC1, SW1_ETH1.port(), VlanId.NONE, true);
+ flowObjectiveService.next(DEVICE_ID, nextObjective);
+
+ // Create the flow objective
+ ForwardingObjective fwd = createForwardingObjective(PREFIX1, true);
+ flowObjectiveService.forward(DEVICE_ID, fwd);
EasyMock.expectLastCall().once();
setUpFlowObjectiveService();
- // Send in the UPDATE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE, fibEntry);
- fibListener.update(Collections.singleton(fibUpdate), Collections.emptyList());
+ // Send in the add event
+ RouteEvent routeEvent = new RouteEvent(RouteEvent.Type.ROUTE_ADDED, resolvedRoute);
+ routeListener.event(routeEvent);
verify(flowObjectiveService);
}
/**
- * Tests adding a FIB entry with to a next hop in a VLAN.
+ * Tests adding a route with to a next hop in a VLAN.
*
* We verify that the flowObjectiveService records the correct state and that the
* correct flowObjectiveService is submitted to the flowObjectiveService.
*/
@Test
- public void testFibAddWithVlan() {
- IpPrefix prefix = Ip4Prefix.valueOf("3.3.3.0/24");
- FibEntry fibEntry = new FibEntry(prefix,
- Ip4Address.valueOf("192.168.40.1"),
- MacAddress.valueOf("00:00:00:00:00:04"));
+ public void testRouteAddWithVlan() {
+ ResolvedRoute route = new ResolvedRoute(PREFIX1, NEXT_HOP2, MAC2);
- //create the next Objective
- Interface egressIntf = interfaceService.getMatchingInterface(fibEntry.nextHopIp());
- TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder()
- .setEthSrc(MacAddress.valueOf("00:00:00:00:00:04"))
- .setEthDst(MacAddress.valueOf("00:00:00:00:00:04"));
- TrafficSelector.Builder metabuilder = null;
- if (!egressIntf.vlan().equals(VlanId.NONE)) {
- treatment.pushVlan()
- .setVlanId(egressIntf.vlan())
- .setVlanPcp((byte) 0);
- } else {
- metabuilder = DefaultTrafficSelector.builder();
- metabuilder.matchVlanId(VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN));
- }
- treatment.setOutput(PortNumber.portNumber(1));
- int nextId = 11;
- NextObjective.Builder nextBuilder = DefaultNextObjective.builder()
- .withId(nextId)
- .addTreatment(treatment.build())
- .withType(NextObjective.Type.SIMPLE)
- .fromApp(APPID);
- if (metabuilder != null) {
- nextBuilder.withMeta(metabuilder.build());
- }
+ // Create the next objective
+ NextObjective nextObjective = createNextObjective(MAC2, MAC2, SW1_ETH2.port(), VLAN1, true);
+ flowObjectiveService.next(DEVICE_ID, nextObjective);
- NextObjective nextObjective = nextBuilder.add();
- flowObjectiveService.next(deviceId, nextObjective);
-
- //set up the flowObjective
- TrafficSelector selector = DefaultTrafficSelector.builder()
- .matchEthType(Ethernet.TYPE_IPV4)
- .matchIPDst(prefix)
- .build();
-
- int priority = prefix.prefixLength() * 5 + 100;
- ForwardingObjective.Builder fwdBuilder = DefaultForwardingObjective.builder()
- .fromApp(APPID)
- .makePermanent()
- .withSelector(selector)
- .withPriority(priority)
- .withFlag(ForwardingObjective.Flag.SPECIFIC);
-
- Integer nextId1 = 11;
- fwdBuilder.nextStep(nextId1);
- flowObjectiveService.forward(deviceId, fwdBuilder.add());
+ // Create the flow objective
+ ForwardingObjective fwd = createForwardingObjective(PREFIX1, true);
+ flowObjectiveService.forward(DEVICE_ID, fwd);
EasyMock.expectLastCall().once();
setUpFlowObjectiveService();
- // Send in the UPDATE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE, fibEntry);
- fibListener.update(Collections.singleton(fibUpdate), Collections.emptyList());
+ // Send in the add event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
verify(flowObjectiveService);
}
/**
- * Tests updating a FIB entry.
+ * Tests updating a route.
*
* We verify that the flowObjectiveService records the correct state and that the
* correct flow is submitted to the flowObjectiveService.
*/
@Test
- public void testFibUpdate() {
+ public void testRouteUpdate() {
// Firstly add a route
- testFibAdd();
+ testRouteAdd();
reset(flowObjectiveService);
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
- // Start to construct a new route entry and new intent
- FibEntry fibEntryUpdate = new FibEntry(prefix,
- Ip4Address.valueOf("192.168.20.1"),
- MacAddress.valueOf("00:00:00:00:00:02"));
- //create the next Objective
- Interface egressIntf = interfaceService.getMatchingInterface(fibEntryUpdate.nextHopIp());
- TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder()
- .setEthSrc(MacAddress.valueOf("00:00:00:00:00:02"))
- .setEthDst(MacAddress.valueOf("00:00:00:00:00:02"));
- TrafficSelector.Builder metabuilder = null;
- if (!egressIntf.vlan().equals(VlanId.NONE)) {
- treatment.pushVlan()
- .setVlanId(egressIntf.vlan())
- .setVlanPcp((byte) 0);
- } else {
- metabuilder = DefaultTrafficSelector.builder();
- metabuilder.matchVlanId(VlanId.vlanId(SingleSwitchFibInstaller.ASSIGNED_VLAN));
- }
- treatment.setOutput(PortNumber.portNumber(1));
- int nextId = 11;
- NextObjective.Builder nextBuilder = DefaultNextObjective.builder()
- .withId(nextId)
- .addTreatment(treatment.build())
- .withType(NextObjective.Type.SIMPLE)
- .fromApp(APPID);
- if (metabuilder != null) {
- nextBuilder.withMeta(metabuilder.build());
- }
+ ResolvedRoute route = new ResolvedRoute(PREFIX1, NEXT_HOP2, MAC2);
- NextObjective nextObjective = nextBuilder.add();
- flowObjectiveService.next(deviceId, nextObjective);
+ // Create the next objective
+ NextObjective nextObjective = createNextObjective(MAC2, MAC2, SW1_ETH2.port(), VLAN1, true);
+ flowObjectiveService.next(DEVICE_ID, nextObjective);
- //set up the flowObjective
- TrafficSelector selector = DefaultTrafficSelector.builder()
- .matchEthType(Ethernet.TYPE_IPV4)
- .matchIPDst(prefix)
- .build();
-
- int priority = prefix.prefixLength() * 5 + 100;
- ForwardingObjective.Builder fwdBuilder = DefaultForwardingObjective.builder()
- .fromApp(APPID)
- .makePermanent()
- .withSelector(selector)
- .withPriority(priority)
- .withFlag(ForwardingObjective.Flag.SPECIFIC);
-
- Integer nextId1 = 11;
- fwdBuilder.nextStep(nextId1);
- flowObjectiveService.forward(deviceId, fwdBuilder.add());
+ // Create the flow objective
+ ForwardingObjective fwd = createForwardingObjective(PREFIX1, true);
+ flowObjectiveService.forward(DEVICE_ID, fwd);
EasyMock.expectLastCall().once();
setUpFlowObjectiveService();
- // Send in the UPDATE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE,
- fibEntryUpdate);
- fibListener.update(Collections.singletonList(fibUpdate),
- Collections.emptyList());
+ // Send in the update event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED, route));
verify(flowObjectiveService);
}
/**
- * Tests deleting a FIB entry.
+ * Tests deleting a route.
*
* We verify that the flowObjectiveService records the correct state and that the
* correct flow is withdrawn from the flowObjectiveService.
*/
@Test
- public void testFibDelete() {
+ public void testRouteDelete() {
// Firstly add a route
- testFibAdd();
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
+ testRouteAdd();
- // Construct the existing route entry
- FibEntry fibEntry = new FibEntry(prefix, null, null);
+ // Construct the existing route
+ ResolvedRoute route = new ResolvedRoute(PREFIX1, null, null);
- //set up the flowObjective
- TrafficSelector selector = DefaultTrafficSelector.builder()
- .matchEthType(Ethernet.TYPE_IPV4)
- .matchIPDst(prefix)
- .build();
-
- int priority = prefix.prefixLength() * 5 + 100;
-
- ForwardingObjective.Builder fwdBuilder = DefaultForwardingObjective.builder()
- .fromApp(APPID)
- .makePermanent()
- .withSelector(selector)
- .withPriority(priority)
- .withFlag(ForwardingObjective.Flag.SPECIFIC);
- fwdBuilder.withTreatment(DefaultTrafficTreatment.builder().build());
+ // Create the flow objective
reset(flowObjectiveService);
- flowObjectiveService.forward(deviceId, fwdBuilder.remove());
+ ForwardingObjective fwd = createForwardingObjective(PREFIX1, false);
+ flowObjectiveService.forward(DEVICE_ID, fwd);
replay(flowObjectiveService);
- // Send in the DELETE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.DELETE, fibEntry);
- fibListener.update(Collections.emptyList(), Collections.singletonList(fibUpdate));
+ // Send in the delete event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_REMOVED, route));
verify(flowObjectiveService);
}
private class TestInterfaceService extends InterfaceServiceAdapter {
-
@Override
public void addListener(InterfaceListener listener) {
- SingleSwitchFibInstallerTest.this.interfaceListener = listener;
- }
-
- @Override
- public Set<Interface> getInterfaces() {
- return interfaces;
- }
-
- @Override
- public Set<Interface> getInterfacesByPort(ConnectPoint port) {
-
- Set<Interface> setIntf = new HashSet<Interface>();
- for (Interface intf : interfaces) {
- if (intf.connectPoint().equals(port)) {
- setIntf.add(intf);
-
- }
- }
- return setIntf;
- }
-
- @Override
- public Interface getMatchingInterface(IpAddress ip) {
- Interface intff = null;
- for (Interface intf : interfaces) {
- for (InterfaceIpAddress address : intf.ipAddresses()) {
- if (address.ipAddress().equals(ip)) {
- intff = intf;
- break;
- }
- }
- }
-
- return intff;
+ interfaceListener = listener;
}
}
- private class TestCoreService extends CoreServiceAdapter {
-
+ private class TestRouteService extends RouteServiceAdapter {
@Override
- public ApplicationId getAppId(String name) {
- return APPID;
- }
-
- @Override
- public ApplicationId registerApplication(String name) {
- return APPID;
- }
- }
-
- private class TestRoutingService extends RoutingServiceAdapter {
-
- @Override
- public void addFibListener(FibListener fibListener) {
- SingleSwitchFibInstallerTest.this.fibListener = fibListener;
+ public void addListener(RouteListener listener) {
+ SingleSwitchFibInstallerTest.this.routeListener = listener;
}
}
@@ -532,9 +388,7 @@
public List<String> getInterfaces() {
ArrayList<String> interfaces = new ArrayList<>();
interfaces.add("of:0000000000000001/1");
- interfaces.add("of:0000000000000002/1");
- interfaces.add("of:0000000000000003/1");
- interfaces.add("of:0000000000000004/1");
+ interfaces.add("of:0000000000000001/2");
return interfaces;
}
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
index c86e6bd..cd4be3d 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
@@ -73,7 +73,6 @@
private static List<String> components = new ArrayList<>();
static {
components.add("org.onosproject.routing.bgp.BgpSessionManager");
- components.add("org.onosproject.routing.impl.Router");
components.add(org.onosproject.sdnip.SdnIpFib.class.getName());
}
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpFib.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpFib.java
index a4bd14c..1179c3d 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpFib.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpFib.java
@@ -34,6 +34,10 @@
import org.onosproject.incubator.net.intf.InterfaceEvent;
import org.onosproject.incubator.net.intf.InterfaceListener;
import org.onosproject.incubator.net.intf.InterfaceService;
+import org.onosproject.incubator.net.routing.ResolvedRoute;
+import org.onosproject.incubator.net.routing.RouteEvent;
+import org.onosproject.incubator.net.routing.RouteListener;
+import org.onosproject.incubator.net.routing.RouteService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
@@ -43,21 +47,15 @@
import org.onosproject.net.intent.Key;
import org.onosproject.net.intent.MultiPointToSinglePointIntent;
import org.onosproject.net.intent.constraint.PartialFailureConstraint;
-import org.onosproject.routing.FibListener;
-import org.onosproject.routing.FibUpdate;
import org.onosproject.routing.IntentSynchronizationService;
-import org.onosproject.routing.RoutingService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import static com.google.common.base.Preconditions.checkArgument;
-
/**
* FIB component of SDN-IP.
*/
@@ -75,9 +73,9 @@
protected CoreService coreService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected RoutingService routingService;
+ protected RouteService routeService;
- private final InternalFibListener fibListener = new InternalFibListener();
+ private final InternalRouteListener routeListener = new InternalRouteListener();
private final InternalInterfaceListener interfaceListener = new InternalInterfaceListener();
private static final int PRIORITY_OFFSET = 100;
@@ -96,69 +94,41 @@
interfaceService.addListener(interfaceListener);
- routingService.addFibListener(fibListener);
- routingService.start();
+ routeService.addListener(routeListener);
}
@Deactivate
public void deactivate() {
interfaceService.removeListener(interfaceListener);
- // TODO remove listener
- routingService.stop();
+ routeService.removeListener(routeListener);
}
- private void update(Collection<FibUpdate> updates, Collection<FibUpdate> withdraws) {
- int submitCount = 0, withdrawCount = 0;
- //
- // NOTE: Semantically, we MUST withdraw existing intents before
- // submitting new intents.
- //
+ private void update(ResolvedRoute route) {
synchronized (this) {
- MultiPointToSinglePointIntent intent;
+ IpPrefix prefix = route.prefix();
+ MultiPointToSinglePointIntent intent =
+ generateRouteIntent(prefix, route.nextHop(), route.nextHopMac());
- //
- // Prepare the Intent batch operations for the intents to withdraw
- //
- for (FibUpdate withdraw : withdraws) {
- checkArgument(withdraw.type() == FibUpdate.Type.DELETE,
- "FibUpdate with wrong type in withdraws list");
-
- IpPrefix prefix = withdraw.entry().prefix();
- intent = routeIntents.remove(prefix);
- if (intent == null) {
- log.trace("SDN-IP No intent in routeIntents to delete " +
- "for prefix: {}", prefix);
- continue;
- }
- intentSynchronizer.withdraw(intent);
- withdrawCount++;
+ if (intent == null) {
+ log.debug("SDN-IP no interface found for route {}", route);
+ return;
}
- //
- // Prepare the Intent batch operations for the intents to submit
- //
- for (FibUpdate update : updates) {
- checkArgument(update.type() == FibUpdate.Type.UPDATE,
- "FibUpdate with wrong type in updates list");
+ routeIntents.put(prefix, intent);
+ intentSynchronizer.submit(intent);
+ }
+ }
- IpPrefix prefix = update.entry().prefix();
- intent = generateRouteIntent(prefix, update.entry().nextHopIp(),
- update.entry().nextHopMac());
-
- if (intent == null) {
- // This preserves the old semantics - if an intent can't be
- // generated, we don't do anything with that prefix. But
- // perhaps we should withdraw the old intent anyway?
- continue;
- }
-
- routeIntents.put(prefix, intent);
- intentSynchronizer.submit(intent);
- submitCount++;
+ private void withdraw(ResolvedRoute route) {
+ synchronized (this) {
+ IpPrefix prefix = route.prefix();
+ MultiPointToSinglePointIntent intent = routeIntents.remove(prefix);
+ if (intent == null) {
+ log.trace("SDN-IP no intent in routeIntents to delete " +
+ "for prefix: {}", prefix);
+ return;
}
-
- log.debug("SDN-IP submitted {}/{}, withdrew = {}/{}", submitCount,
- updates.size(), withdrawCount, withdraws.size());
+ intentSynchronizer.withdraw(intent);
}
}
@@ -292,10 +262,20 @@
}
}
- private class InternalFibListener implements FibListener {
+ private class InternalRouteListener implements RouteListener {
@Override
- public void update(Collection<FibUpdate> updates, Collection<FibUpdate> withdraws) {
- SdnIpFib.this.update(updates, withdraws);
+ public void event(RouteEvent event) {
+ switch (event.type()) {
+ case ROUTE_ADDED:
+ case ROUTE_UPDATED:
+ update(event.subject());
+ break;
+ case ROUTE_REMOVED:
+ withdraw(event.subject());
+ break;
+ default:
+ break;
+ }
}
}
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
index 898b8bb..7c2be29 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
@@ -23,7 +23,6 @@
import org.onlab.packet.Ethernet;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip4Prefix;
-import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
@@ -35,6 +34,10 @@
import org.onosproject.incubator.net.intf.InterfaceListener;
import org.onosproject.incubator.net.intf.InterfaceService;
import org.onosproject.incubator.net.intf.InterfaceServiceAdapter;
+import org.onosproject.incubator.net.routing.ResolvedRoute;
+import org.onosproject.incubator.net.routing.RouteEvent;
+import org.onosproject.incubator.net.routing.RouteListener;
+import org.onosproject.incubator.net.routing.RouteServiceAdapter;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.PortNumber;
@@ -46,11 +49,7 @@
import org.onosproject.net.intent.AbstractIntentTest;
import org.onosproject.net.intent.Key;
import org.onosproject.net.intent.MultiPointToSinglePointIntent;
-import org.onosproject.routing.FibEntry;
-import org.onosproject.routing.FibListener;
-import org.onosproject.routing.FibUpdate;
import org.onosproject.routing.IntentSynchronizationService;
-import org.onosproject.routing.RoutingServiceAdapter;
import java.util.Collections;
import java.util.HashSet;
@@ -81,10 +80,6 @@
DeviceId.deviceId("of:0000000000000002"),
PortNumber.portNumber(1));
- private static final ConnectPoint SW3_ETH1 = new ConnectPoint(
- DeviceId.deviceId("of:0000000000000003"),
- PortNumber.portNumber(1));
-
private static final ConnectPoint SW4_ETH1 = new ConnectPoint(
DeviceId.deviceId("of:0000000000000004"),
PortNumber.portNumber(1));
@@ -93,13 +88,15 @@
DeviceId.deviceId("of:0000000000000005"),
PortNumber.portNumber(1));
+ private static final IpPrefix PREFIX1 = Ip4Prefix.valueOf("1.1.1.0/24");
+
private SdnIpFib sdnipFib;
private IntentSynchronizationService intentSynchronizer;
private final Set<Interface> interfaces = Sets.newHashSet();
private static final ApplicationId APPID = TestApplicationId.create("SDNIP");
- private FibListener fibListener;
+ private RouteListener routeListener;
private InterfaceListener interfaceListener;
@Before
@@ -118,7 +115,7 @@
intentSynchronizer = createMock(IntentSynchronizationService.class);
sdnipFib = new SdnIpFib();
- sdnipFib.routingService = new TestRoutingService();
+ sdnipFib.routeService = new TestRouteService();
sdnipFib.coreService = new TestCoreService();
sdnipFib.interfaceService = interfaceService;
sdnipFib.intentSynchronizer = intentSynchronizer;
@@ -131,45 +128,24 @@
*/
private void setUpInterfaceService() {
List<InterfaceIpAddress> interfaceIpAddresses1 = Lists.newArrayList();
- interfaceIpAddresses1.add(new InterfaceIpAddress(
- IpAddress.valueOf("192.168.10.101"),
- IpPrefix.valueOf("192.168.10.0/24")));
+ interfaceIpAddresses1.add(InterfaceIpAddress.valueOf("192.168.10.101/24"));
Interface sw1Eth1 = new Interface("sw1-eth1", SW1_ETH1,
interfaceIpAddresses1, MacAddress.valueOf("00:00:00:00:00:01"),
VlanId.NONE);
interfaces.add(sw1Eth1);
List<InterfaceIpAddress> interfaceIpAddresses2 = Lists.newArrayList();
- interfaceIpAddresses2.add(
- new InterfaceIpAddress(IpAddress.valueOf("192.168.20.101"),
- IpPrefix.valueOf("192.168.20.0/24")));
+ interfaceIpAddresses2.add(InterfaceIpAddress.valueOf("192.168.20.101/24"));
Interface sw2Eth1 = new Interface("sw2-eth1", SW2_ETH1,
interfaceIpAddresses2, MacAddress.valueOf("00:00:00:00:00:02"),
VlanId.NONE);
interfaces.add(sw2Eth1);
- List<InterfaceIpAddress> interfaceIpAddresses3 = Lists.newArrayList();
- interfaceIpAddresses3.add(
- new InterfaceIpAddress(IpAddress.valueOf("192.168.30.101"),
- IpPrefix.valueOf("192.168.30.0/24")));
- Interface sw3Eth1 = new Interface("sw3-eth1", SW3_ETH1,
- interfaceIpAddresses3, MacAddress.valueOf("00:00:00:00:00:03"),
- VlanId.NONE);
- interfaces.add(sw3Eth1);
-
- InterfaceIpAddress interfaceIpAddress4 =
- new InterfaceIpAddress(IpAddress.valueOf("192.168.40.101"),
- IpPrefix.valueOf("192.168.40.0/24"));
+ InterfaceIpAddress interfaceIpAddress4 = InterfaceIpAddress.valueOf("192.168.40.101/24");
Interface sw4Eth1 = new Interface("sw4-eth1", SW4_ETH1,
Lists.newArrayList(interfaceIpAddress4),
MacAddress.valueOf("00:00:00:00:00:04"),
VlanId.vlanId((short) 1));
-
- expect(interfaceService.getInterfacesByPort(SW4_ETH1)).andReturn(
- Collections.singleton(sw4Eth1)).anyTimes();
- expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.40.1")))
- .andReturn(sw4Eth1).anyTimes();
-
interfaces.add(sw4Eth1);
expect(interfaceService.getInterfacesByPort(SW1_ETH1)).andReturn(
@@ -180,31 +156,29 @@
Collections.singleton(sw2Eth1)).anyTimes();
expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.20.1")))
.andReturn(sw2Eth1).anyTimes();
- expect(interfaceService.getInterfacesByPort(SW3_ETH1)).andReturn(
- Collections.singleton(sw3Eth1)).anyTimes();
- expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.30.1")))
- .andReturn(sw3Eth1).anyTimes();
+ expect(interfaceService.getInterfacesByPort(SW4_ETH1)).andReturn(
+ Collections.singleton(sw4Eth1)).anyTimes();
+ expect(interfaceService.getMatchingInterface(Ip4Address.valueOf("192.168.40.1")))
+ .andReturn(sw4Eth1).anyTimes();
expect(interfaceService.getInterfaces()).andReturn(interfaces).anyTimes();
}
/**
- * Tests adding a FIB entry to the IntentSynchronizer.
+ * Tests adding a route.
*
* We verify that the synchronizer records the correct state and that the
* correct intent is submitted to the IntentService.
*/
@Test
- public void testFibAdd() {
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
- FibEntry fibEntry = new FibEntry(prefix,
+ public void testRouteAdd() {
+ ResolvedRoute route = new ResolvedRoute(PREFIX1,
Ip4Address.valueOf("192.168.10.1"),
MacAddress.valueOf("00:00:00:00:00:01"));
// Construct a MultiPointToSinglePointIntent intent
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
- selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(
- fibEntry.prefix());
+ selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1);
TrafficTreatment.Builder treatmentBuilder =
DefaultTrafficTreatment.builder();
@@ -212,13 +186,12 @@
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(SW2_ETH1);
- ingressPoints.add(SW3_ETH1);
ingressPoints.add(SW4_ETH1);
MultiPointToSinglePointIntent intent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
- .key(Key.of(prefix.toString(), APPID))
+ .key(Key.of(PREFIX1.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
@@ -230,23 +203,21 @@
intentSynchronizer.submit(eqExceptId(intent));
replay(intentSynchronizer);
- // Send in the UPDATE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE, fibEntry);
- fibListener.update(Collections.singleton(fibUpdate), Collections.emptyList());
+ // Send in the added event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
verify(intentSynchronizer);
}
/**
- * Tests adding a FIB entry with to a next hop in a VLAN.
+ * Tests adding a route with to a next hop in a VLAN.
*
* We verify that the synchronizer records the correct state and that the
* correct intent is submitted to the IntentService.
*/
@Test
- public void testFibAddWithVlan() {
- IpPrefix prefix = Ip4Prefix.valueOf("3.3.3.0/24");
- FibEntry fibEntry = new FibEntry(prefix,
+ public void testRouteAddWithVlan() {
+ ResolvedRoute route = new ResolvedRoute(PREFIX1,
Ip4Address.valueOf("192.168.40.1"),
MacAddress.valueOf("00:00:00:00:00:04"));
@@ -254,7 +225,7 @@
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
selectorBuilder.matchEthType(Ethernet.TYPE_IPV4)
- .matchIPDst(fibEntry.prefix())
+ .matchIPDst(PREFIX1)
.matchVlanId(VlanId.ANY);
TrafficTreatment.Builder treatmentBuilder =
@@ -265,12 +236,11 @@
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(SW1_ETH1);
ingressPoints.add(SW2_ETH1);
- ingressPoints.add(SW3_ETH1);
MultiPointToSinglePointIntent intent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
- .key(Key.of(prefix.toString(), APPID))
+ .key(Key.of(PREFIX1.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
@@ -283,36 +253,32 @@
replay(intentSynchronizer);
- // Send in the UPDATE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE, fibEntry);
- fibListener.update(Collections.singleton(fibUpdate), Collections.emptyList());
+ // Send in the added event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_ADDED, route));
verify(intentSynchronizer);
}
/**
- * Tests updating a FIB entry.
+ * Tests updating a route.
*
* We verify that the synchronizer records the correct state and that the
* correct intent is submitted to the IntentService.
*/
@Test
- public void testFibUpdate() {
+ public void testRouteUpdate() {
// Firstly add a route
- testFibAdd();
-
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
+ testRouteAdd();
// Start to construct a new route entry and new intent
- FibEntry fibEntryUpdate = new FibEntry(prefix,
+ ResolvedRoute route = new ResolvedRoute(PREFIX1,
Ip4Address.valueOf("192.168.20.1"),
MacAddress.valueOf("00:00:00:00:00:02"));
// Construct a new MultiPointToSinglePointIntent intent
TrafficSelector.Builder selectorBuilderNew =
DefaultTrafficSelector.builder();
- selectorBuilderNew.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(
- fibEntryUpdate.prefix());
+ selectorBuilderNew.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1);
TrafficTreatment.Builder treatmentBuilderNew =
DefaultTrafficTreatment.builder();
@@ -320,13 +286,12 @@
Set<ConnectPoint> ingressPointsNew = new HashSet<>();
ingressPointsNew.add(SW1_ETH1);
- ingressPointsNew.add(SW3_ETH1);
ingressPointsNew.add(SW4_ETH1);
MultiPointToSinglePointIntent intentNew =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
- .key(Key.of(prefix.toString(), APPID))
+ .key(Key.of(PREFIX1.toString(), APPID))
.selector(selectorBuilderNew.build())
.treatment(treatmentBuilderNew.build())
.ingressPoints(ingressPointsNew)
@@ -341,36 +306,30 @@
intentSynchronizer.submit(eqExceptId(intentNew));
replay(intentSynchronizer);
- // Send in the UPDATE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.UPDATE,
- fibEntryUpdate);
- fibListener.update(Collections.singletonList(fibUpdate),
- Collections.emptyList());
+ // Send in the update event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_UPDATED, route));
verify(intentSynchronizer);
}
/**
- * Tests deleting a FIB entry.
+ * Tests deleting a route.
*
* We verify that the synchronizer records the correct state and that the
* correct intent is withdrawn from the IntentService.
*/
@Test
- public void testFibDelete() {
+ public void testRouteDelete() {
// Firstly add a route
- testFibAdd();
-
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
+ testRouteAdd();
// Construct the existing route entry
- FibEntry fibEntry = new FibEntry(prefix, null, null);
+ ResolvedRoute route = new ResolvedRoute(PREFIX1, null, null);
// Construct the existing MultiPointToSinglePoint intent
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
- selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(
- fibEntry.prefix());
+ selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1);
TrafficTreatment.Builder treatmentBuilder =
DefaultTrafficTreatment.builder();
@@ -378,13 +337,12 @@
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(SW2_ETH1);
- ingressPoints.add(SW3_ETH1);
ingressPoints.add(SW4_ETH1);
MultiPointToSinglePointIntent addedIntent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
- .key(Key.of(prefix.toString(), APPID))
+ .key(Key.of(PREFIX1.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
@@ -398,23 +356,20 @@
intentSynchronizer.withdraw(eqExceptId(addedIntent));
replay(intentSynchronizer);
- // Send in the DELETE FibUpdate
- FibUpdate fibUpdate = new FibUpdate(FibUpdate.Type.DELETE, fibEntry);
- fibListener.update(Collections.emptyList(), Collections.singletonList(fibUpdate));
+ // Send in the removed event
+ routeListener.event(new RouteEvent(RouteEvent.Type.ROUTE_REMOVED, route));
verify(intentSynchronizer);
}
@Test
public void testAddInterface() {
- testFibAdd();
-
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
+ testRouteAdd();
// Construct the existing MultiPointToSinglePoint intent
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
- selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(prefix);
+ selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1);
TrafficTreatment.Builder treatmentBuilder =
DefaultTrafficTreatment.builder();
@@ -422,14 +377,13 @@
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(SW2_ETH1);
- ingressPoints.add(SW3_ETH1);
ingressPoints.add(SW4_ETH1);
ingressPoints.add(SW5_ETH1);
MultiPointToSinglePointIntent addedIntent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
- .key(Key.of(prefix.toString(), APPID))
+ .key(Key.of(PREFIX1.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
@@ -455,14 +409,12 @@
@Test
public void testRemoveInterface() {
- testFibAdd();
-
- IpPrefix prefix = Ip4Prefix.valueOf("1.1.1.0/24");
+ testRouteAdd();
// Construct the existing MultiPointToSinglePoint intent
TrafficSelector.Builder selectorBuilder =
DefaultTrafficSelector.builder();
- selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(prefix);
+ selectorBuilder.matchEthType(Ethernet.TYPE_IPV4).matchIPDst(PREFIX1);
TrafficTreatment.Builder treatmentBuilder =
DefaultTrafficTreatment.builder();
@@ -470,12 +422,11 @@
Set<ConnectPoint> ingressPoints = new HashSet<>();
ingressPoints.add(SW2_ETH1);
- ingressPoints.add(SW3_ETH1);
MultiPointToSinglePointIntent addedIntent =
MultiPointToSinglePointIntent.builder()
.appId(APPID)
- .key(Key.of(prefix.toString(), APPID))
+ .key(Key.of(PREFIX1.toString(), APPID))
.selector(selectorBuilder.build())
.treatment(treatmentBuilder.build())
.ingressPoints(ingressPoints)
@@ -506,16 +457,14 @@
}
}
- private class TestRoutingService extends RoutingServiceAdapter {
-
+ private class TestRouteService extends RouteServiceAdapter {
@Override
- public void addFibListener(FibListener fibListener) {
- SdnIpFibTest.this.fibListener = fibListener;
+ public void addListener(RouteListener routeListener) {
+ SdnIpFibTest.this.routeListener = routeListener;
}
}
private class InterfaceServiceDelegate extends InterfaceServiceAdapter {
-
@Override
public void addListener(InterfaceListener listener) {
SdnIpFibTest.this.interfaceListener = listener;
diff --git a/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java b/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
index 0689eb0..5558161 100644
--- a/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
+++ b/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
@@ -49,7 +49,6 @@
private final List<String> components = ImmutableList.<String>builder()
.add("org.onosproject.routing.fpm.FpmManager")
- .add("org.onosproject.routing.impl.Router")
.add("org.onosproject.routing.impl.SingleSwitchFibInstaller")
.add("org.onosproject.routing.impl.ControlPlaneRedirectManager")
.build();
diff --git a/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java b/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
index 7fe8c1c..1ceb784 100644
--- a/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
+++ b/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
@@ -182,11 +182,6 @@
@Override
public String toString() {
- /*return toStringHelper(this).add("ipAddress", ipAddress)
- .add("subnetAddress", subnetAddress)
- .add("broadcastAddress", broadcastAddress)
- .add("peerAddress", peerAddress)
- .omitNullValues().toString();*/
return ipAddress.toString() + "/" + subnetAddress.prefixLength();
}
}