commit aa8de497656fa7ab4186b0fe2e0fb7af70361401
author Jordi Ortiz <jordi.ortiz@um.es> Thu Dec 01 00:21:36 2016 +0100
committer Pier Luigi <pierventre@hotmail.com> Tue Jan 24 12:08:25 2017 -0800
tree ea0f550ea934f86c860780ea4b3da6e4057f58f7
parent 67f2cca4634d24722c934cfe2cfdd3d177565b78

[ONOS-5599] Store meter features into MeterStore

Change-Id: I22f7366b87cad6fc706b6ff7b0ccff1a0e85ad6a

providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java

diff --git a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
index cff47bb..b343c56 100644
--- a/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
+++ b/providers/openflow/meter/src/main/java/org/onosproject/provider/of/meter/impl/OpenFlowMeterProvider.java
@@ -34,6 +34,7 @@
 import org.onosproject.net.meter.DefaultMeter;
 import org.onosproject.net.meter.Meter;
 import org.onosproject.net.meter.MeterFailReason;
+import org.onosproject.net.meter.MeterFeatures;
 import org.onosproject.net.meter.MeterId;
 import org.onosproject.net.meter.MeterOperation;
 import org.onosproject.net.meter.MeterOperations;
@@ -51,11 +52,13 @@
 import org.onosproject.openflow.controller.OpenFlowSwitch;
 import org.onosproject.openflow.controller.OpenFlowSwitchListener;
 import org.onosproject.openflow.controller.RoleState;
+import org.onosproject.provider.of.meter.util.MeterFeaturesBuilder;
 import org.projectfloodlight.openflow.protocol.OFErrorMsg;
 import org.projectfloodlight.openflow.protocol.OFErrorType;
 import org.projectfloodlight.openflow.protocol.OFMessage;
 import org.projectfloodlight.openflow.protocol.OFMeterBandStats;
 import org.projectfloodlight.openflow.protocol.OFMeterConfigStatsReply;
+import org.projectfloodlight.openflow.protocol.OFMeterFeatures;
 import org.projectfloodlight.openflow.protocol.OFMeterStats;
 import org.projectfloodlight.openflow.protocol.OFMeterStatsReply;
 import org.projectfloodlight.openflow.protocol.OFPortStatus;
@@ -74,6 +77,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
 
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.openflow.controller.Dpid.uri;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -255,6 +260,25 @@
 
     }
 
+    private MeterFeatures buildMeterFeatures(Dpid dpid, OFMeterFeatures mf) {
+        if (mf != null) {
+            return new MeterFeaturesBuilder(mf, deviceId(uri(dpid)))
+                    .build();
+        } else {
+            // This will usually happen for OpenFlow devices prior to 1.3
+            return MeterFeaturesBuilder.noMeterFeatures(deviceId(uri(dpid)));
+        }
+    }
+
+    private void pushMeterFeatures(Dpid dpid, OFMeterFeatures meterFeatures) {
+        providerService.pushMeterFeatures(deviceId(uri(dpid)),
+                buildMeterFeatures(dpid, meterFeatures));
+    }
+
+    private void destroyMeterFeatures(Dpid dpid) {
+        providerService.deleteMeterFeatures(deviceId(uri(dpid)));
+    }
+
     private Map<Long, Meter> collectMeters(DeviceId deviceId,
                                            OFMeterConfigStatsReply reply) {
         return Maps.newHashMap();
@@ -383,11 +407,13 @@
         @Override
         public void switchAdded(Dpid dpid) {
             createStatsCollection(controller.getSwitch(dpid));
+            pushMeterFeatures(dpid, controller.getSwitch(dpid).getMeterFeatures());
         }
 
         @Override
         public void switchRemoved(Dpid dpid) {
             stopCollectorIfNeeded(collectors.remove(dpid));
+            destroyMeterFeatures(dpid);
         }
 
         @Override