Bug fix: make sure that divisor is non-zero value

Change-Id: I7214ebf552ba60db149db2b4edbb90f59d3bdd16

@@ -28,6 +28,7 @@ import org.onosproject.cpman.message.ControlMessageProviderService;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.DeviceId;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFType;
 import org.projectfloodlight.openflow.protocol.OFType;
+import org.slf4j.Logger;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collection;
@@ -36,12 +37,15 @@ import java.util.Map;
 import java.util.Set;
 import java.util.Set;
 
 
 import static org.onosproject.provider.of.message.impl.OpenFlowControlMessageMapper.lookupControlMessageType;
 import static org.onosproject.provider.of.message.impl.OpenFlowControlMessageMapper.lookupControlMessageType;
+import static org.slf4j.LoggerFactory.getLogger;
 
 
 /**
 /**
  * Collects the OpenFlow messages and aggregates using MetricsService.
  * Collects the OpenFlow messages and aggregates using MetricsService.
  */
  */
 public class OpenFlowControlMessageAggregator implements Runnable {
 public class OpenFlowControlMessageAggregator implements Runnable {
 
 
+    private final Logger log = getLogger(getClass());
+
     private static final Set<OFType> OF_TYPE_SET =
     private static final Set<OFType> OF_TYPE_SET =
             ImmutableSet.of(OFType.PACKET_IN, OFType.PACKET_OUT, OFType.FLOW_MOD,
             ImmutableSet.of(OFType.PACKET_IN, OFType.PACKET_OUT, OFType.FLOW_MOD,
                     OFType.FLOW_REMOVED, OFType.STATS_REQUEST, OFType.STATS_REPLY);
                     OFType.FLOW_REMOVED, OFType.STATS_REQUEST, OFType.STATS_REPLY);
@@ -103,8 +107,10 @@ public class OpenFlowControlMessageAggregator implements Runnable {
                 new DefaultControlMessage(lookupControlMessageType(type),
                 new DefaultControlMessage(lookupControlMessageType(type),
                         getLoad(type), getRate(type), getCount(type),
                         getLoad(type), getRate(type), getCount(type),
                         System.currentTimeMillis())));
                         System.currentTimeMillis())));
+        log.debug("sent aggregated control message");
         providerService.updateStatsInfo(deviceId,
         providerService.updateStatsInfo(deviceId,
                 Collections.unmodifiableCollection(controlMessages));
                 Collections.unmodifiableCollection(controlMessages));
+        controlMessages.clear();
     }
     }
 
 
     /**
     /**
@@ -114,8 +120,11 @@ public class OpenFlowControlMessageAggregator implements Runnable {
      * @return load value
      * @return load value
      */
      */
     private long getLoad(OFType type) {
     private long getLoad(OFType type) {
+        if (countMeterMap.get(type).getOneMinuteRate() == 0D) {
+            return 0L;
+        }
         return (long) rateMeterMap.get(type).getOneMinuteRate() /
         return (long) rateMeterMap.get(type).getOneMinuteRate() /
-                (long) countMeterMap.get(type).getOneMinuteRate();
+               (long) countMeterMap.get(type).getOneMinuteRate();
     }
     }
 
 
     /**
     /**

@@ -106,7 +106,7 @@ public class OpenFlowControlMessageProvider extends AbstractProvider
         controller.getSwitches().forEach(sw -> sw.addEventListener(outMsgListener));
         controller.getSwitches().forEach(sw -> sw.addEventListener(outMsgListener));
 
 
         executor = Executors.newSingleThreadScheduledExecutor(
         executor = Executors.newSingleThreadScheduledExecutor(
-                groupedThreads("onos/provider", "aggregator"));
+                             groupedThreads("onos/provider", "aggregator"));
 
 
         connectInitialDevices();
         connectInitialDevices();
         log.info("Started");
         log.info("Started");