Merge remote-tracking branch 'origin/master'

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.onlab.onos.cli.net;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onlab.onos.cli.AbstractShellCommand;
+import org.onlab.onos.net.ConnectPoint;
+import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.PortNumber;
+
+import org.onlab.onos.net.statistic.Load;
+import org.onlab.onos.net.statistic.StatisticService;
+
+
+import static org.onlab.onos.net.DeviceId.deviceId;
+import static org.onlab.onos.net.PortNumber.portNumber;
+
+/**
+ * Fetches statistics.
+ */
+@Command(scope = "onos", name = "get-stats",
+         description = "Fetches stats for a connection point")
+public class GetStatistics extends AbstractShellCommand {
+
+    @Argument(index = 0, name = "connectPoint",
+              description = "Device/Port Description",
+              required = true, multiValued = false)
+    String connectPoint = null;
+
+
+    @Override
+    protected void execute() {
+        StatisticService service = get(StatisticService.class);
+
+        DeviceId ingressDeviceId = deviceId(getDeviceId(connectPoint));
+        PortNumber ingressPortNumber = portNumber(getPortNumber(connectPoint));
+        ConnectPoint cp = new ConnectPoint(ingressDeviceId, ingressPortNumber);
+
+        Load load = service.load(cp);
+
+        print("Load on %s -> %s", cp, load);
+    }
+
+    /**
+     * Extracts the port number portion of the ConnectPoint.
+     *
+     * @param deviceString string representing the device/port
+     * @return port number as a string, empty string if the port is not found
+     */
+    private String getPortNumber(String deviceString) {
+        int slash = deviceString.indexOf('/');
+        if (slash <= 0) {
+            return "";
+        }
+        return deviceString.substring(slash + 1, deviceString.length());
+    }
+
+    /**
+     * Extracts the device ID portion of the ConnectPoint.
+     *
+     * @param deviceString string representing the device/port
+     * @return device ID string
+     */
+    private String getDeviceId(String deviceString) {
+        int slash = deviceString.indexOf('/');
+        if (slash <= 0) {
+            return "";
+        }
+        return deviceString.substring(0, slash);
+    }
+}

@@ -119,6 +119,12 @@
             </optional-completers>
         </command>
         <command>
+            <action class="org.onlab.onos.cli.net.GetStatistics"/>
+                <completers>
+                    <ref component-id="connectPointCompleter"/>
+                </completers>
+        </command>
+        <command>
             <action class="org.onlab.onos.cli.net.AddMultiPointToSinglePointIntentCommand"/>
             <completers>
                 <ref component-id="connectPointCompleter"/>

 package org.onlab.onos.net.statistic;
 
+import com.google.common.base.MoreObjects;
 import org.onlab.onos.net.flow.FlowRuleProvider;
 
 /**
@@ -53,4 +54,11 @@ public class DefaultLoad implements Load {
     public long time() {
         return time;
     }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper("Load").add("rate", rate())
+                .add("latest", latest()).toString();
+
+    }
 }

@@ -3,8 +3,7 @@ package org.onlab.onos.store.statistic.impl;
 import static org.onlab.onos.store.statistic.impl.StatisticStoreMessageSubjects.*;
 import static org.slf4j.LoggerFactory.getLogger;
 
-import com.google.common.collect.ImmutableSet;
-
+import com.google.common.collect.Sets;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -130,7 +129,7 @@ public class DistributedStatisticStore implements StatisticStore {
     }
 
     @Override
-    public void removeFromStatistics(FlowRule rule) {
+    public synchronized void removeFromStatistics(FlowRule rule) {
         ConnectPoint cp = buildConnectPoint(rule);
         if (cp == null) {
             return;
@@ -139,6 +138,15 @@ public class DistributedStatisticStore implements StatisticStore {
         if (rep != null) {
             rep.remove(rule);
         }
+        Set<FlowEntry> values = current.get(cp);
+        if (values != null) {
+            values.remove(rule);
+        }
+        values = previous.get(cp);
+        if (values != null) {
+            values.remove(rule);
+        }
+
     }
 
     @Override
@@ -181,7 +189,7 @@ public class DistributedStatisticStore implements StatisticStore {
                 return SERIALIZER.decode(response.get(STATISTIC_STORE_TIMEOUT_MILLIS,
                                                       TimeUnit.MILLISECONDS));
             } catch (IOException | TimeoutException e) {
-                // FIXME: throw a FlowStoreException
+                // FIXME: throw a StatsStoreException
                 throw new RuntimeException(e);
             }
         }
@@ -200,7 +208,7 @@ public class DistributedStatisticStore implements StatisticStore {
         } else {
             ClusterMessage message = new ClusterMessage(
                     clusterService.getLocalNode().id(),
-                    GET_CURRENT,
+                    GET_PREVIOUS,
                     SERIALIZER.encode(connectPoint));
 
             try {
@@ -209,7 +217,7 @@ public class DistributedStatisticStore implements StatisticStore {
                 return SERIALIZER.decode(response.get(STATISTIC_STORE_TIMEOUT_MILLIS,
                                                       TimeUnit.MILLISECONDS));
             } catch (IOException | TimeoutException e) {
-                // FIXME: throw a FlowStoreException
+                // FIXME: throw a StatsStoreException
                 throw new RuntimeException(e);
             }
         }
@@ -283,7 +291,7 @@ public class DistributedStatisticStore implements StatisticStore {
 
         public synchronized Set<FlowEntry> get() {
             counter.set(rules.size());
-            return ImmutableSet.copyOf(rules);
+            return Sets.newHashSet(rules);
         }
 
 

@@ -31,6 +31,7 @@ import org.onlab.onos.net.flow.DefaultFlowEntry;
 import org.onlab.onos.net.flow.DefaultFlowRule;
 import org.onlab.onos.net.flow.DefaultTrafficSelector;
 import org.onlab.onos.net.flow.DefaultTrafficTreatment;
+import org.onlab.onos.net.flow.FlowEntry;
 import org.onlab.onos.net.flow.FlowId;
 import org.onlab.onos.net.flow.criteria.Criteria;
 import org.onlab.onos.net.flow.criteria.Criterion;
@@ -98,6 +99,7 @@ public final class KryoNamespaces {
                     DefaultHostDescription.class,
                     DefaultFlowRule.class,
                     DefaultFlowEntry.class,
+                    FlowEntry.FlowEntryState.class,
                     FlowId.class,
                     DefaultTrafficSelector.class,
                     Criteria.PortCriterion.class,