mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-14 08:51:01 +02:00
Code Issues Projects Releases Wiki Activity

Implement an option in CPRM to reprogram the flows when device reconnecting

Browse Source 
Also remove unused AsyncDeviceFetcher in FibInstaller

Change-Id: I52e778a51854efd6bfe47c56569efa5c27d7c7fb
This commit is contained in:
Charles Chan 2017-02-28 15:15:17 -08:00 committed by Ray Milkey
parent 5deaab5fdc
commit c6d227e242
8 changed files with 135 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/routing-api/src/main/java/org/onosproject/routing/AsyncDeviceFetcher.java
View File

@ -22,7 +22,7 @@ import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import static com.google.common.base.Preconditions.checkNotNull;
@ -36,7 +36,8 @@ public final class AsyncDeviceFetcher {
private DeviceListener listener = new InternalDeviceListener();
private Map<DeviceId, CompletableFuture<DeviceId>> devices = new ConcurrentHashMap();
private Map<DeviceId, Runnable> onConnect = new ConcurrentHashMap<>();
private Map<DeviceId, Runnable> onDisconnect = new ConcurrentHashMap<>();
private AsyncDeviceFetcher(DeviceService deviceService) {
this.deviceService = checkNotNull(deviceService);
@ -48,24 +49,27 @@ public final class AsyncDeviceFetcher {
*/
public void shutdown() {
deviceService.removeListener(listener);
devices.clear();
onConnect.clear();
onDisconnect.clear();
}
/**
* Returns a completable future that completes when the device is available
* for the first time.
*
* @param deviceId ID of the device
* @return completable future
* Executes provided callback when given device connects/disconnects.
* @param deviceId device ID
* @param onConnect callback that will be executed immediately if the device
* is currently online, or when the device becomes online
* @param onDisconnect callback that will be executed when the device becomes offline
*/
public CompletableFuture<DeviceId> getDevice(DeviceId deviceId) {
CompletableFuture<DeviceId> future = new CompletableFuture<>();
return devices.computeIfAbsent(deviceId, deviceId1 -> {
void registerCallback(DeviceId deviceId, Runnable onConnect, Runnable onDisconnect) {
if (onConnect != null) {
if (deviceService.isAvailable(deviceId)) {
future.complete(deviceId);
onConnect.run();
}
this.onConnect.put(deviceId, onConnect);
}
if (onDisconnect != null) {
this.onDisconnect.put(deviceId, onDisconnect);
}
return future;
});
}
/**
@ -84,12 +88,11 @@ public final class AsyncDeviceFetcher {
switch (event.type()) {
case DEVICE_ADDED:
case DEVICE_AVAILABILITY_CHANGED:
if (deviceService.isAvailable(event.subject().id())) {
DeviceId deviceId = event.subject().id();
CompletableFuture<DeviceId> future = devices.get(deviceId);
if (future != null) {
future.complete(deviceId);
}
if (deviceService.isAvailable(deviceId)) {
Optional.ofNullable(onConnect.get(deviceId)).ifPresent(Runnable::run);
} else {
Optional.ofNullable(onDisconnect.get(deviceId)).ifPresent(Runnable::run);
}
break;
case DEVICE_UPDATED:

59
apps/routing-api/src/main/java/org/onosproject/routing/Router.java
View File

@ -53,9 +53,9 @@ public class Router {
private InterfaceService interfaceService;
private InterfaceListener listener = new InternalInterfaceListener();
private AsyncDeviceFetcher asyncDeviceFetcher;
private DeviceService deviceService;
private volatile boolean deviceAvailable = false;
private AsyncDeviceFetcher asyncDeviceFetcher;
/**
* Creates a new router interface manager.
@ -65,27 +65,26 @@ public class Router {
* @param deviceService device service
* @param provisioner consumer that will provision new interfaces
* @param unprovisioner consumer that will unprovision old interfaces
* @param forceUnprovision force unprovision when the device goes offline
*/
public Router(RouterInfo info,
InterfaceService interfaceService,
DeviceService deviceService,
Consumer<InterfaceProvisionRequest> provisioner,
Consumer<InterfaceProvisionRequest> unprovisioner) {
Consumer<InterfaceProvisionRequest> unprovisioner,
boolean forceUnprovision) {
this.info = checkNotNull(info);
this.provisioner = checkNotNull(provisioner);
this.unprovisioner = checkNotNull(unprovisioner);
this.interfaceService = checkNotNull(interfaceService);
this.deviceService = checkNotNull(deviceService);
this.asyncDeviceFetcher = AsyncDeviceFetcher.create(deviceService);
asyncDeviceFetcher.getDevice(info.deviceId())
.thenAccept(deviceId1 -> {
deviceAvailable = true;
provision();
}).whenComplete((v, t) -> {
if (t != null) {
log.error("Error provisioning: ", t);
if (forceUnprovision) {
asyncDeviceFetcher.registerCallback(info.deviceId(), this::provision, this::forceUnprovision);
} else {
asyncDeviceFetcher.registerCallback(info.deviceId(), this::provision, null);
}
});
interfaceService.addListener(listener);
}
@ -94,6 +93,8 @@ public class Router {
* Cleans up the router and unprovisions all interfaces.
*/
public void cleanup() {
asyncDeviceFetcher.shutdown();
interfaceService.removeListener(listener);
unprovision();
@ -112,8 +113,15 @@ public class Router {
* Changes the router configuration.
*
* @param newConfig new configuration
* @param forceUnprovision true if we want to force unprovision the device when it goes offline
*/
public void changeConfiguration(RouterInfo newConfig) {
public void changeConfiguration(RouterInfo newConfig, boolean forceUnprovision) {
if (forceUnprovision) {
asyncDeviceFetcher.registerCallback(info.deviceId(), this::provision, this::forceUnprovision);
} else {
asyncDeviceFetcher.registerCallback(info.deviceId(), this::provision, null);
}
Set<String> oldConfiguredInterfaces = info.interfaces();
info = newConfig;
Set<String> newConfiguredInterfaces = info.interfaces();
@ -153,18 +161,21 @@ public class Router {
private void provision() {
getInterfacesForDevice(info.deviceId())
.filter(this::shouldProvision)
.forEach(this::provision);
}
private void unprovision() {
getInterfacesForDevice(info.deviceId())
.filter(this::shouldProvision)
.forEach(this::unprovision);
}
private void forceUnprovision() {
getInterfacesForDevice(info.deviceId())
.forEach(this::forceUnprovision);
}
private void provision(Interface intf) {
if (!provisioned.contains(intf) && shouldProvision(intf)) {
if (!provisioned.contains(intf) && deviceAvailable(intf) && shouldProvision(intf)) {
log.info("Provisioning interface {}", intf);
provisioner.accept(InterfaceProvisionRequest.of(info, intf));
provisioned.add(intf);
@ -172,16 +183,28 @@ public class Router {
}
private void unprovision(Interface intf) {
if (provisioned.contains(intf)) {
if (provisioned.contains(intf) && deviceAvailable(intf) && shouldProvision(intf)) {
log.info("Unprovisioning interface {}", intf);
unprovisioner.accept(InterfaceProvisionRequest.of(info, intf));
provisioned.remove(intf);
}
}
private void forceUnprovision(Interface intf) {
// Skip availability check when force unprovisioning an interface
if (provisioned.contains(intf) && shouldProvision(intf)) {
log.info("Unprovisioning interface {}", intf);
unprovisioner.accept(InterfaceProvisionRequest.of(info, intf));
provisioned.remove(intf);
}
}
private boolean deviceAvailable(Interface intf) {
return deviceService.isAvailable(intf.connectPoint().deviceId());
}
private boolean shouldProvision(Interface intf) {
return deviceAvailable &&
(info.interfaces().isEmpty() || info.interfaces().contains(intf.name()));
return info.interfaces().isEmpty() || info.interfaces().contains(intf.name());
}
private Stream<Interface> getInterfacesForDevice(DeviceId deviceId) {

1
apps/routing/cpr/BUCK
View File

@ -8,6 +8,7 @@ TEST_DEPS = [
'//lib:TEST_ADAPTERS',
'//incubator/api:onos-incubator-api-tests',
'//apps/routing-api:onos-apps-routing-api-tests',
'//utils/osgi:onlab-osgi-tests',
]
osgi_jar_with_tests (

8
apps/routing/cpr/pom.xml
View File

@ -27,5 +27,13 @@
<artifactId>onos-apps-routing-cpr</artifactId>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
<artifactId>onlab-osgi</artifactId>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies>
</project>

47
apps/routing/cpr/src/main/java/org/onosproject/routing/cpr/ControlPlaneRedirectManager.java
View File

@ -22,6 +22,8 @@ import com.google.common.collect.Maps;
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.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.packet.EthType;
@ -30,7 +32,9 @@ import org.onlab.packet.Ip6Address;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onlab.util.Tools;
import org.onosproject.app.ApplicationService;
import org.onosproject.cfg.ComponentConfigService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.incubator.net.intf.Interface;
@ -63,8 +67,10 @@ import org.onosproject.routing.RoutingService;
import org.onosproject.routing.config.RouterConfigHelper;
import org.onosproject.routing.config.RoutersConfig;
import org.onosproject.routing.config.RoutingConfigurationService;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import java.util.Dictionary;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@ -127,6 +133,13 @@ public class ControlPlaneRedirectManager {
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected RoutingConfigurationService rs;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected ComponentConfigService cfgService;
@Property(name = "forceUnprovision", boolValue = false,
label = "Force unprovision when the device goes offline")
private boolean forceUnprovision = false;
private static final String APP_NAME = "org.onosproject.cpr";
private ApplicationId appId;
@ -139,9 +152,12 @@ public class ControlPlaneRedirectManager {
private final InternalHostListener hostListener = new InternalHostListener();
@Activate
protected void activate() {
protected void activate(ComponentContext context) {
this.appId = coreService.registerApplication(APP_NAME);
cfgService.registerProperties(getClass());
modified(context);
networkConfigService.addListener(networkConfigListener);
hostService.addListener(hostListener);
@ -153,10 +169,34 @@ public class ControlPlaneRedirectManager {
@Deactivate
protected void deactivate() {
cfgService.unregisterProperties(getClass(), false);
networkConfigService.removeListener(networkConfigListener);
hostService.removeListener(hostListener);
}
@Modified
protected void modified(ComponentContext context) {
if (context != null) {
readComponentConfiguration(context);
processRouterConfig();
}
}
private void readComponentConfiguration(ComponentContext context) {
Dictionary<?, ?> properties = context.getProperties();
Boolean flag;
flag = Tools.isPropertyEnabled(properties, "forceUnprovision");
if (flag == null) {
log.info("ForceUnprovision is not configured, " +
"using current value of {}", forceUnprovision);
} else {
forceUnprovision = flag;
log.info("Configured. ForceUnprovision is {}",
forceUnprovision ? "enabled" : "disabled");
}
}
/**
* Sets up the router interfaces if router config is available.
*/
@ -174,7 +214,7 @@ public class ControlPlaneRedirectManager {
if (r == null) {
return createRouter(RouterInfo.from(router));
} else {
r.changeConfiguration(RouterInfo.from(router));
r.changeConfiguration(RouterInfo.from(router), forceUnprovision);
return r;
}
});
@ -198,7 +238,8 @@ public class ControlPlaneRedirectManager {
interfaceService,
deviceService,
this::provisionInterface,
this::unprovisionInterface);
this::unprovisionInterface,
forceUnprovision);
}
private void provisionInterface(InterfaceProvisionRequest intf) {

3
apps/routing/cpr/src/test/java/org/onosproject/routing/cpr/ControlPlaneRedirectManagerTest.java
View File

@ -21,6 +21,7 @@ import org.easymock.EasyMock;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.onlab.osgi.ComponentContextAdapter;
import org.onlab.packet.EthType;
import org.onlab.packet.Ip6Address;
import org.onlab.packet.IpAddress;
@ -152,7 +153,7 @@ public class ControlPlaneRedirectManagerTest {
controlPlaneRedirectManager.hostService = createNiceMock(HostService.class);
controlPlaneRedirectManager.mastershipService = mastershipService;
controlPlaneRedirectManager.applicationService = applicationService;
controlPlaneRedirectManager.activate();
controlPlaneRedirectManager.activate(new ComponentContextAdapter());
verify(flowObjectiveService);
}

10
apps/routing/fibinstaller/src/main/java/org/onosproject/routing/fibinstaller/FibInstaller.java
View File

@ -65,7 +65,6 @@ 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.routing.AsyncDeviceFetcher;
import org.onosproject.routing.NextHop;
import org.onosproject.routing.NextHopGroupKey;
import org.onosproject.routing.RouterInfo;
@ -137,7 +136,6 @@ public class FibInstaller {
private DeviceId deviceId;
private Router interfaceManager;
private AsyncDeviceFetcher asyncDeviceFetcher;
private ApplicationId coreAppId;
private ApplicationId routerAppId;
@ -177,8 +175,6 @@ public class FibInstaller {
networkConfigService.addListener(configListener);
asyncDeviceFetcher = AsyncDeviceFetcher.create(deviceService);
processRouterConfig();
applicationService.registerDeactivateHook(fibAppId, () -> cleanUp());
@ -188,7 +184,6 @@ public class FibInstaller {
@Deactivate
protected void deactivate() {
asyncDeviceFetcher.shutdown();
networkConfigService.removeListener(configListener);
componentConfigService.unregisterProperties(getClass(), false);
@ -226,7 +221,7 @@ public class FibInstaller {
interfaceManager = createRouter(RouterInfo.from(routerConfig));
} else {
interfaceManager.changeConfiguration(RouterInfo.from(routerConfig));
interfaceManager.changeConfiguration(RouterInfo.from(routerConfig), false);
}
}
@ -253,7 +248,8 @@ public class FibInstaller {
interfaceService,
deviceService,
this::provisionInterface,
this::unprovisionInterface);
this::unprovisionInterface,
false);
}
private void updateRoute(ResolvedRoute route) {

3
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
View File

@ -360,7 +360,8 @@ public class SegmentRoutingManager implements SegmentRoutingService {
"arpEnabled", "false");
compCfgService.preSetProperty("org.onosproject.net.host.impl.HostManager",
"greedyLearningIpv6", "true");
compCfgService.preSetProperty("org.onosproject.routing.cpr.ControlPlaneRedirectManager",
"forceUnprovision", "true");
processor = new InternalPacketProcessor();
linkListener = new InternalLinkListener();