Adding JSON output for intent list command.

@@ -19,6 +19,7 @@ import org.onlab.onos.net.intent.PathIntent;
 import org.onlab.onos.net.intent.PointToPointIntent;
 import org.onlab.onos.net.intent.PointToPointIntent;
 import org.onlab.onos.net.intent.SinglePointToMultiPointIntent;
 import org.onlab.onos.net.intent.SinglePointToMultiPointIntent;
 
 
+import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
 /**
 /**
@@ -39,20 +40,24 @@ public class IntentsListCommand extends AbstractShellCommand {
                 print("id=%s, state=%s, type=%s, appId=%s",
                 print("id=%s, state=%s, type=%s, appId=%s",
                       intent.id(), state, intent.getClass().getSimpleName(),
                       intent.id(), state, intent.getClass().getSimpleName(),
                       intent.appId().name());
                       intent.appId().name());
-                printDetails(intent);
+                printDetails(service, intent);
             }
             }
         }
         }
     }
     }
 
 
-    private void printDetails(Intent intent) {
+    private void printDetails(IntentService service, Intent intent) {
         if (intent.resources() != null && !intent.resources().isEmpty()) {
         if (intent.resources() != null && !intent.resources().isEmpty()) {
             print("    resources=%s", intent.resources());
             print("    resources=%s", intent.resources());
         }
         }
         if (intent instanceof ConnectivityIntent) {
         if (intent instanceof ConnectivityIntent) {
             ConnectivityIntent ci = (ConnectivityIntent) intent;
             ConnectivityIntent ci = (ConnectivityIntent) intent;
+            if (!ci.selector().criteria().isEmpty()) {
                 print("    selector=%s", ci.selector().criteria());
                 print("    selector=%s", ci.selector().criteria());
+            }
+            if (!ci.treatment().instructions().isEmpty()) {
                 print("    treatment=%s", ci.treatment().instructions());
                 print("    treatment=%s", ci.treatment().instructions());
             }
             }
+        }
 
 
         if (intent instanceof PointToPointIntent) {
         if (intent instanceof PointToPointIntent) {
             PointToPointIntent pi = (PointToPointIntent) intent;
             PointToPointIntent pi = (PointToPointIntent) intent;
@@ -71,6 +76,11 @@ public class IntentsListCommand extends AbstractShellCommand {
             print("    links=%s", li.links());
             print("    links=%s", li.links());
             print("    egress=%s", li.egressPoint());
             print("    egress=%s", li.egressPoint());
         }
         }
+
+        List<Intent> installable = service.getInstallableIntents(intent.id());
+        if (installable != null && !installable.isEmpty()) {
+            print("    installable=%s", installable);
+        }
     }
     }
 
 
     // Produces JSON array of the specified intents.
     // Produces JSON array of the specified intents.
@@ -86,10 +96,14 @@ public class IntentsListCommand extends AbstractShellCommand {
     private JsonNode json(IntentService service, ObjectMapper mapper, Intent intent) {
     private JsonNode json(IntentService service, ObjectMapper mapper, Intent intent) {
         ObjectNode result = mapper.createObjectNode()
         ObjectNode result = mapper.createObjectNode()
                 .put("id", intent.id().toString())
                 .put("id", intent.id().toString())
-                .put("state", service.getIntentState(intent.id()).toString())
                 .put("type", intent.getClass().getSimpleName())
                 .put("type", intent.getClass().getSimpleName())
                 .put("appId", intent.appId().name());
                 .put("appId", intent.appId().name());
 
 
+        IntentState state = service.getIntentState(intent.id());
+        if (state != null) {
+            result.put("state", state.toString());
+        }
+
         if (intent.resources() != null && !intent.resources().isEmpty()) {
         if (intent.resources() != null && !intent.resources().isEmpty()) {
             ArrayNode rnode = mapper.createArrayNode();
             ArrayNode rnode = mapper.createArrayNode();
             for (NetworkResource resource : intent.resources()) {
             for (NetworkResource resource : intent.resources()) {
@@ -136,6 +150,10 @@ public class IntentsListCommand extends AbstractShellCommand {
             result.set("links", LinksListCommand.json(li.links()));
             result.set("links", LinksListCommand.json(li.links()));
         }
         }
 
 
+        List<Intent> installable = service.getInstallableIntents(intent.id());
+        if (installable != null && !installable.isEmpty()) {
+            result.set("installable", json(service, installable));
+        }
         return result;
         return result;
     }
     }
 
 

 package org.onlab.onos.net.intent;
 package org.onlab.onos.net.intent;
 
 
 
 
+import java.util.List;
+
 /**
 /**
  * Service for application submitting or withdrawing their intents.
  * Service for application submitting or withdrawing their intents.
  */
  */
@@ -68,6 +70,15 @@ public interface IntentService {
     IntentState getIntentState(IntentId id);
     IntentState getIntentState(IntentId id);
 
 
     /**
     /**
+     * Returns the list of the installable events associated with the specified
+     * top-level intent.
+     *
+     * @param intentId top-level intent identifier
+     * @return compiled installable intents
+     */
+    List<Intent> getInstallableIntents(IntentId intentId);
+
+    /**
      * Adds the specified listener for intent events.
      * Adds the specified listener for intent events.
      *
      *
      * @param listener listener to be added
      * @param listener listener to be added

@@ -196,6 +196,11 @@ public class FakeIntentManager implements TestableIntentService {
     }
     }
 
 
     @Override
     @Override
+    public List<Intent> getInstallableIntents(IntentId intentId) {
+        return installables.get(intentId);
+    }
+
+    @Override
     public void addListener(IntentListener listener) {
     public void addListener(IntentListener listener) {
         listeners.add(listener);
         listeners.add(listener);
     }
     }

@@ -153,6 +153,12 @@ public class IntentManager
     }
     }
 
 
     @Override
     @Override
+    public List<Intent> getInstallableIntents(IntentId intentId) {
+        checkNotNull(intentId, INTENT_ID_NULL);
+        return store.getInstallableIntents(intentId);
+    }
+
+    @Override
     public void addListener(IntentListener listener) {
     public void addListener(IntentListener listener) {
         listenerRegistry.addListener(listener);
         listenerRegistry.addListener(listener);
     }
     }