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

Working on intent uninstall during recompilation.

Browse Source
This commit is contained in:
tom 2014-10-07 11:01:36 -07:00
parent 672488d8cf
commit 53945d53f7
5 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
View File

@ -35,7 +35,7 @@ public class DevicesListCommand extends AbstractShellCommand {
* @param service device service
* @return sorted device list
*/
protected List<Device> getSortedDevices(DeviceService service) {
protected static List<Device> getSortedDevices(DeviceService service) {
List<Device> devices = newArrayList(service.getDevices());
Collections.sort(devices, Comparators.ELEMENT_COMPARATOR);
return devices;

3
cli/src/main/java/org/onlab/onos/cli/net/FlowsListCommand.java
View File

@ -1,6 +1,7 @@
package org.onlab.onos.cli.net;
import static com.google.common.collect.Lists.newArrayList;
import static org.onlab.onos.cli.net.DevicesListCommand.getSortedDevices;
import java.util.Collections;
import java.util.List;
@ -64,7 +65,7 @@ public class FlowsListCommand extends AbstractShellCommand {
if (state != null && !state.equals("any")) {
s = FlowEntryState.valueOf(state.toUpperCase());
}
Iterable<Device> devices = uri == null ? deviceService.getDevices() :
Iterable<Device> devices = uri == null ? getSortedDevices(deviceService) :
Collections.singletonList(deviceService.getDevice(DeviceId.deviceId(uri)));
for (Device d : devices) {
if (s == null) {

2
core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java
View File

@ -128,7 +128,7 @@ public class FakeIntentManager implements TestableIntentService {
setState(intent, IntentState.WITHDRAWN);
dispatch(new IntentEvent(IntentEvent.Type.WITHDRAWN, intent));
} catch (IntentException e) {
// FIXME: Do we really want to do this?
// FIXME: Rework this to always go from WITHDRAWING to WITHDRAWN!
setState(intent, IntentState.FAILED);
dispatch(new IntentEvent(IntentEvent.Type.FAILED, intent));
}

42
core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
View File

@ -36,6 +36,7 @@ import java.util.concurrent.ExecutorService;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static org.onlab.onos.net.intent.IntentState.*;
import static org.onlab.util.Tools.delay;
import static org.onlab.util.Tools.namedThreads;
import static org.slf4j.LoggerFactory.getLogger;
@ -226,6 +227,8 @@ public class IntentManager
executeInstallingPhase(intent);
} catch (Exception e) {
log.warn("Unable to compile intent {} due to: {}", intent.id(), e);
// If compilation failed, mark the intent as failed.
store.setState(intent, FAILED);
}
@ -238,8 +241,6 @@ public class IntentManager
for (Intent compiled : getCompiler(intent).compile(intent)) {
InstallableIntent installableIntent = (InstallableIntent) compiled;
installable.add(installableIntent);
trackerService.addTrackedResources(intent.id(),
installableIntent.requiredLinks());
}
return installable;
}
@ -259,12 +260,17 @@ public class IntentManager
if (installables != null) {
for (InstallableIntent installable : installables) {
registerSubclassInstallerIfNeeded(installable);
trackerService.addTrackedResources(intent.id(),
installable.requiredLinks());
getInstaller(installable).install(installable);
}
}
eventDispatcher.post(store.setState(intent, INSTALLED));
} catch (Exception e) {
log.warn("Unable to install intent {} due to: {}", intent.id(), e);
uninstallIntent(intent);
// If compilation failed, kick off the recompiling phase.
executeRecompilingPhase(intent);
}
@ -299,6 +305,8 @@ public class IntentManager
executeInstallingPhase(intent);
}
} catch (Exception e) {
log.warn("Unable to recompile intent {} due to: {}", intent.id(), e);
// If compilation failed, mark the intent as failed.
eventDispatcher.post(store.setState(intent, FAILED));
}
@ -313,12 +321,7 @@ public class IntentManager
private void executeWithdrawingPhase(Intent intent) {
// Indicate that the intent is being withdrawn.
store.setState(intent, WITHDRAWING);
List<InstallableIntent> installables = store.getInstallableIntents(intent.id());
if (installables != null) {
for (InstallableIntent installable : installables) {
getInstaller(installable).uninstall(installable);
}
}
uninstallIntent(intent);
// If all went well, disassociate the top-level intent with its
// installable derivatives and mark it as withdrawn.
@ -326,6 +329,24 @@ public class IntentManager
eventDispatcher.post(store.setState(intent, WITHDRAWN));
}
/**
* Uninstalls all installable intents associated with the given intent.
*
* @param intent intent to be uninstalled
*/
private void uninstallIntent(Intent intent) {
try {
List<InstallableIntent> installables = store.getInstallableIntents(intent.id());
if (installables != null) {
for (InstallableIntent installable : installables) {
getInstaller(installable).uninstall(installable);
}
}
} catch (IntentException e) {
log.warn("Unable to uninstall intent {} due to: {}", intent.id(), e);
}
}
/**
* Registers an intent compiler of the specified intent if an intent compiler
* for the intent is not registered. This method traverses the class hierarchy of
@ -394,7 +415,10 @@ public class IntentManager
boolean compileAllFailed) {
// Attempt recompilation of the specified intents first.
for (IntentId intentId : intentIds) {
executeRecompilingPhase(getIntent(intentId));
Intent intent = getIntent(intentId);
uninstallIntent(intent);
delay(1000);
executeRecompilingPhase(intent);
}
if (compileAllFailed) {

2
core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java
View File

@ -113,7 +113,7 @@ public class ObjectiveTracker implements ObjectiveTrackerService {
@Override
public void run() {
if (event.reasons() == null) {
delegate.triggerCompile(null, false);
delegate.triggerCompile(null, true);
} else {
Set<IntentId> toBeRecompiled = new HashSet<>();