Added a summary command.

@@ -14,6 +14,7 @@ import org.onlab.onos.net.flow.TrafficSelector;
 import org.onlab.onos.net.flow.TrafficTreatment;
 import org.onlab.onos.net.flow.TrafficTreatment;
 import org.onlab.onos.net.host.HostService;
 import org.onlab.onos.net.host.HostService;
 import org.onlab.onos.net.intent.HostToHostIntent;
 import org.onlab.onos.net.intent.HostToHostIntent;
+import org.onlab.onos.net.intent.Intent;
 import org.onlab.onos.net.intent.IntentId;
 import org.onlab.onos.net.intent.IntentId;
 import org.onlab.onos.net.intent.IntentService;
 import org.onlab.onos.net.intent.IntentService;
 import org.onlab.onos.net.packet.DefaultOutboundPacket;
 import org.onlab.onos.net.packet.DefaultOutboundPacket;
@@ -26,6 +27,9 @@ import org.onlab.onos.net.topology.TopologyService;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.Ethernet;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.slf4j.LoggerFactory.getLogger;
 
 
 /**
 /**
@@ -52,6 +56,8 @@ public class IntentReactiveForwarding {
 
 
     private static long intentId = 1;
     private static long intentId = 1;
 
 
+    private Map<HostIdPair, IntentId> intents = new ConcurrentHashMap<>();
+
     @Activate
     @Activate
     public void activate() {
     public void activate() {
         packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
         packetService.addProcessor(processor, PacketProcessor.ADVISOR_MAX + 2);
@@ -91,8 +97,12 @@ public class IntentReactiveForwarding {
                 return;
                 return;
             }
             }
 
 
+            // Install a new intent only if we have not installed one already
+            HostIdPair key = new HostIdPair(srcId, dstId);
+            if (!intents.containsKey(key)) {
                 // Otherwise forward and be done with it.
                 // Otherwise forward and be done with it.
-            setUpConnectivity(context, srcId, dstId);
+                intents.put(key, setUpConnectivity(context, srcId, dstId).getId());
+            }
             forwardPacketToDst(context, dst);
             forwardPacketToDst(context, dst);
         }
         }
     }
     }
@@ -122,15 +132,26 @@ public class IntentReactiveForwarding {
     }
     }
 
 
     // Install a rule forwarding the packet to the specified port.
     // Install a rule forwarding the packet to the specified port.
-    private void setUpConnectivity(PacketContext context, HostId srcId, HostId dstId) {
+    private Intent setUpConnectivity(PacketContext context, HostId srcId, HostId dstId) {
         TrafficSelector selector = DefaultTrafficSelector.builder().build();
         TrafficSelector selector = DefaultTrafficSelector.builder().build();
         TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
         TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
 
 
         HostToHostIntent intent =
         HostToHostIntent intent =
                 new HostToHostIntent(new IntentId(intentId++), srcId, dstId,
                 new HostToHostIntent(new IntentId(intentId++), srcId, dstId,
                                      selector, treatment);
                                      selector, treatment);
-
         intentService.submit(intent);
         intentService.submit(intent);
+        return intent;
     }
     }
 
 
+
+    private class HostIdPair {
+        HostId one;
+        HostId two;
+
+        HostIdPair(HostId one, HostId two) {
+            boolean oneFirst = one.hashCode() < two.hashCode();
+            this.one = oneFirst ? one : two;
+            this.two = oneFirst ? two : one;
+        }
+    }
 }
 }

+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.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);
+        print("nodes=%d, devices=%d, links=%d, hosts=%d, clusters=%s, flows=%d, intents=%d",
+              get(ClusterService.class).getNodes().size(),
+              get(DeviceService.class).getDeviceCount(),
+              get(LinkService.class).getLinkCount(),
+              get(HostService.class).getHostCount(),
+              topologyService.getClusters(topologyService.currentTopology()).size(),
+              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);
     }
     }

@@ -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)) {