Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

+package org.onlab.onos.cli;
+
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cluster.ClusterService;
+import org.onlab.onos.net.device.DeviceService;
+import org.onlab.onos.net.flow.FlowRuleService;
+import org.onlab.onos.net.host.HostService;
+import org.onlab.onos.net.intent.IntentService;
+import org.onlab.onos.net.link.LinkService;
+import org.onlab.onos.net.topology.Topology;
+import org.onlab.onos.net.topology.TopologyService;
+
+/**
+ * Provides summary of ONOS model.
+ */
+@Command(scope = "onos", name = "summary",
+         description = "Provides summary of ONOS model")
+public class SummaryCommand extends AbstractShellCommand {
+
+    @Override
+    protected void execute() {
+        TopologyService topologyService = get(TopologyService.class);
+        Topology topology = topologyService.currentTopology();
+        print("nodes=%d, devices=%d, links=%d, hosts=%d, clusters=%s, paths=%d, flows=%d, intents=%d",
+              get(ClusterService.class).getNodes().size(),
+              get(DeviceService.class).getDeviceCount(),
+              get(LinkService.class).getLinkCount(),
+              get(HostService.class).getHostCount(),
+              topologyService.getClusters(topology).size(),
+              topology.pathCount(),
+              get(FlowRuleService.class).getFlowRuleCount(),
+              get(IntentService.class).getIntentCount());
+    }
+
+}

@@ -2,6 +2,9 @@
 
 
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
     <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
         <command>
         <command>
+            <action class="org.onlab.onos.cli.SummaryCommand"/>
+        </command>
+        <command>
             <action class="org.onlab.onos.cli.NodesListCommand"/>
             <action class="org.onlab.onos.cli.NodesListCommand"/>
         </command>
         </command>
         <command>
         <command>

@@ -13,6 +13,13 @@ import org.onlab.onos.net.DeviceId;
 public interface FlowRuleService {
 public interface FlowRuleService {
 
 
     /**
     /**
+     * Returns the number of flow rules in the system.
+     *
+     * @return flow rule count
+     */
+    int getFlowRuleCount();
+
+    /**
      * Returns the collection of flow entries applied on the specified device.
      * Returns the collection of flow entries applied on the specified device.
      * This will include flow rules which may not yet have been applied to
      * This will include flow rules which may not yet have been applied to
      * the device.
      * the device.
@@ -72,7 +79,4 @@ public interface FlowRuleService {
      * @param listener flow rule listener
      * @param listener flow rule listener
      */
      */
     void removeListener(FlowRuleListener listener);
     void removeListener(FlowRuleListener listener);
-
-
-
 }
 }

@@ -10,7 +10,15 @@ import org.onlab.onos.store.Store;
 public interface FlowRuleStore extends Store<FlowRuleEvent, FlowRuleStoreDelegate> {
 public interface FlowRuleStore extends Store<FlowRuleEvent, FlowRuleStoreDelegate> {
 
 
     /**
     /**
+     * Returns the number of flow rule in the store.
+     *
+     * @return number of flow rules
+     */
+    int getFlowRuleCount();
+
+    /**
      * Returns the stored flow.
      * Returns the stored flow.
+     *
      * @param rule the rule to look for
      * @param rule the rule to look for
      * @return a flow rule
      * @return a flow rule
      */
      */
@@ -60,5 +68,4 @@ public interface FlowRuleStore extends Store<FlowRuleEvent, FlowRuleStoreDelegat
      * @return flow_removed event, or null if nothing removed
      * @return flow_removed event, or null if nothing removed
      */
      */
     FlowRuleEvent removeFlowRule(FlowEntry rule);
     FlowRuleEvent removeFlowRule(FlowEntry rule);
-
 }
 }

@@ -40,8 +40,8 @@ import com.google.common.collect.Lists;
 @Component(immediate = true)
 @Component(immediate = true)
 @Service
 @Service
 public class FlowRuleManager
 public class FlowRuleManager
-extends AbstractProviderRegistry<FlowRuleProvider, FlowRuleProviderService>
-implements FlowRuleService, FlowRuleProviderRegistry {
+        extends AbstractProviderRegistry<FlowRuleProvider, FlowRuleProviderService>
+        implements FlowRuleService, FlowRuleProviderRegistry {
 
 
     public static final String FLOW_RULE_NULL = "FlowRule cannot be null";
     public static final String FLOW_RULE_NULL = "FlowRule cannot be null";
     private final Logger log = getLogger(getClass());
     private final Logger log = getLogger(getClass());
@@ -75,6 +75,11 @@ implements FlowRuleService, FlowRuleProviderRegistry {
     }
     }
 
 
     @Override
     @Override
+    public int getFlowRuleCount() {
+        return store.getFlowRuleCount();
+    }
+
+    @Override
     public Iterable<FlowEntry> getFlowEntries(DeviceId deviceId) {
     public Iterable<FlowEntry> getFlowEntries(DeviceId deviceId) {
         return store.getFlowEntries(deviceId);
         return store.getFlowEntries(deviceId);
     }
     }
@@ -98,11 +103,13 @@ implements FlowRuleService, FlowRuleProviderRegistry {
         for (int i = 0; i < flowRules.length; i++) {
         for (int i = 0; i < flowRules.length; i++) {
             f = flowRules[i];
             f = flowRules[i];
             device = deviceService.getDevice(f.deviceId());
             device = deviceService.getDevice(f.deviceId());
-            frp = getProvider(device.providerId());
             store.deleteFlowRule(f);
             store.deleteFlowRule(f);
+            if (device != null) {
+                frp = getProvider(device.providerId());
                 frp.removeFlowRule(f);
                 frp.removeFlowRule(f);
             }
             }
         }
         }
+    }
 
 
     @Override
     @Override
     public void removeFlowRulesById(ApplicationId id) {
     public void removeFlowRulesById(ApplicationId id) {

@@ -115,12 +115,7 @@ public class FlowTracker implements FlowTrackerService {
                 for (Event reason : event.reasons()) {
                 for (Event reason : event.reasons()) {
                     if (reason instanceof LinkEvent) {
                     if (reason instanceof LinkEvent) {
                         LinkEvent linkEvent = (LinkEvent) reason;
                         LinkEvent linkEvent = (LinkEvent) reason;
-                        if (linkEvent.type() == LinkEvent.Type.LINK_ADDED ||
-                                linkEvent.type() == LinkEvent.Type.LINK_UPDATED) {
                         delegate.bumpIntents(intentsByLink.get(new LinkKey(linkEvent.subject())));
                         delegate.bumpIntents(intentsByLink.get(new LinkKey(linkEvent.subject())));
-                        } else if (linkEvent.type() == LinkEvent.Type.LINK_REMOVED) {
-                            delegate.failIntents(intentsByLink.get(new LinkKey(linkEvent.subject())));
-                        }
                     }
                     }
                 }
                 }
             }
             }

@@ -359,13 +359,5 @@ public class IntentManager
             }
             }
         }
         }
 
 
-        @Override
-        public void failIntents(Iterable<IntentId> intentIds) {
-            for (IntentId intentId : intentIds) {
-                Intent intent = getIntent(intentId);
-                uninstallIntent(intent);
-                compileIntent(intent);
-            }
-        }
     }
     }
 }
 }

@@ -15,12 +15,4 @@ public interface TopologyChangeDelegate {
      */
      */
     void bumpIntents(Iterable<IntentId> intentIds);
     void bumpIntents(Iterable<IntentId> intentIds);
 
 
-    /**
-     * Notifies that topology has changed in such a way that the specified
-     * intents should be marked failed and then recompiled.
-     *
-     * @param intentIds intents that should be failed and recompiled
-     */
-    void failIntents(Iterable<IntentId> intentIds);
-
 }
 }

@@ -58,6 +58,11 @@ public class DistributedFlowRuleStore
 
 
 
 
     @Override
     @Override
+    public int getFlowRuleCount() {
+        return flowEntries.size();
+    }
+
+    @Override
     public synchronized FlowEntry getFlowEntry(FlowRule rule) {
     public synchronized FlowEntry getFlowEntry(FlowRule rule) {
         for (FlowEntry f : flowEntries.get(rule.deviceId())) {
         for (FlowEntry f : flowEntries.get(rule.deviceId())) {
             if (f.equals(rule)) {
             if (f.equals(rule)) {

@@ -58,6 +58,11 @@ public class DistributedFlowRuleStore
 
 
 
 
     @Override
     @Override
+    public int getFlowRuleCount() {
+        return flowEntries.size();
+    }
+
+    @Override
     public synchronized FlowEntry getFlowEntry(FlowRule rule) {
     public synchronized FlowEntry getFlowEntry(FlowRule rule) {
         for (FlowEntry f : flowEntries.get(rule.deviceId())) {
         for (FlowEntry f : flowEntries.get(rule.deviceId())) {
             if (f.equals(rule)) {
             if (f.equals(rule)) {

@@ -57,6 +57,11 @@ public class SimpleFlowRuleStore
 
 
 
 
     @Override
     @Override
+    public int getFlowRuleCount() {
+        return flowEntries.size();
+    }
+
+    @Override
     public synchronized FlowEntry getFlowEntry(FlowRule rule) {
     public synchronized FlowEntry getFlowEntry(FlowRule rule) {
         for (FlowEntry f : flowEntries.get(rule.deviceId())) {
         for (FlowEntry f : flowEntries.get(rule.deviceId())) {
             if (f.equals(rule)) {
             if (f.equals(rule)) {