cleaning up some meter code
Change-Id: Ie901d51cf6ade2c497f90fadb093179404967d13
diff --git a/core/api/src/main/java/org/onosproject/net/meter/MeterKey.java b/core/api/src/main/java/org/onosproject/net/meter/MeterKey.java
index 086d4d6..5bc01b0 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/MeterKey.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/MeterKey.java
@@ -18,6 +18,8 @@
import com.google.common.base.Objects;
import org.onosproject.net.DeviceId;
+import static com.google.common.base.MoreObjects.toStringHelper;
+
/**
* A meter key represents a meter uniquely.
*/
@@ -57,6 +59,13 @@
return Objects.hashCode(deviceId, id);
}
+ @Override
+ public String toString() {
+ return toStringHelper(this)
+ .add("deviceId", deviceId)
+ .add("meterId", id).toString();
+ }
+
public static MeterKey key(DeviceId deviceId, MeterId id) {
return new MeterKey(deviceId, id);
}
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
index 8c86e01..5c5c11c 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
@@ -80,9 +80,6 @@
@Activate
public void activate() {
- /*meterIdCounter = storageService.atomicCounterBuilder()
- .withName(METERCOUNTERIDENTIFIER)
- .build();*/
store.setDelegate(delegate);