[SDFAB-355] Revisit MeterService and north abstractions
Change-Id: I685cb90d53f8aa61017ecda9fa7ff842e58e2940
diff --git a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkMeterManager.java b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkMeterManager.java
index 9ec530b..9d4f7e4 100644
--- a/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkMeterManager.java
+++ b/apps/virtual/app/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkMeterManager.java
@@ -30,6 +30,7 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.meter.DefaultMeter;
import org.onosproject.net.meter.Meter;
+import org.onosproject.net.meter.MeterCellId;
import org.onosproject.net.meter.MeterEvent;
import org.onosproject.net.meter.MeterFailReason;
import org.onosproject.net.meter.MeterFeatures;
@@ -139,11 +140,16 @@
@Override
public void withdraw(MeterRequest request, MeterId meterId) {
+ withdraw(request, (MeterCellId) meterId);
+ }
+
+ @Override
+ public void withdraw(MeterRequest request, MeterCellId meterCellId) {
Meter.Builder mBuilder = DefaultMeter.builder()
.forDevice(request.deviceId())
.fromApp(request.appId())
.withBands(request.bands())
- .withId(meterId)
+ .withCellId(meterCellId)
.withUnit(request.unit());
if (request.isBurst()) {
@@ -158,6 +164,11 @@
@Override
public Meter getMeter(DeviceId deviceId, MeterId id) {
+ return getMeter(deviceId, (MeterCellId) id);
+ }
+
+ @Override
+ public Meter getMeter(DeviceId deviceId, MeterCellId id) {
MeterKey key = MeterKey.key(deviceId, id);
return store.getMeter(networkId(), key);
}