Working on intent uninstall during recompilation.

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

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

@@ -128,7 +128,7 @@ public class FakeIntentManager implements TestableIntentService {
             setState(intent, IntentState.WITHDRAWN);
             setState(intent, IntentState.WITHDRAWN);
             dispatch(new IntentEvent(IntentEvent.Type.WITHDRAWN, intent));
             dispatch(new IntentEvent(IntentEvent.Type.WITHDRAWN, intent));
         } catch (IntentException e) {
         } 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);
             setState(intent, IntentState.FAILED);
             dispatch(new IntentEvent(IntentEvent.Type.FAILED, intent));
             dispatch(new IntentEvent(IntentEvent.Type.FAILED, intent));
         }
         }

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

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