adding device specific counters for meter ids in
the meter service.
Change-Id: I38d38a0a85024927f5a74013b2b4d9efa9b32d22
diff --git a/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java b/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java
index 94cada4..51394c3 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/DefaultMeterRequest.java
@@ -43,7 +43,8 @@
private DefaultMeterRequest(DeviceId deviceId, ApplicationId appId,
Meter.Unit unit, boolean burst,
- Collection<Band> bands, MeterContext context, Type op) {
+ Collection<Band> bands, MeterContext context,
+ Type op) {
this.deviceId = deviceId;
this.appId = appId;
this.unit = unit;
@@ -58,6 +59,7 @@
return deviceId;
}
+
@Override
public ApplicationId appId() {
return appId;
@@ -107,6 +109,7 @@
private Collection<Band> bands;
private DeviceId deviceId;
private MeterContext context;
+ private Optional<MeterId> desiredId = Optional.empty();
@Override
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
new file mode 100644
index 0000000..086d4d6
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/meter/MeterKey.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed 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.onosproject.net.meter;
+
+import com.google.common.base.Objects;
+import org.onosproject.net.DeviceId;
+
+/**
+ * A meter key represents a meter uniquely.
+ */
+public final class MeterKey {
+
+ private final DeviceId deviceId;
+ private final MeterId id;
+
+ private MeterKey(DeviceId deviceId, MeterId id) {
+ this.deviceId = deviceId;
+ this.id = id;
+ }
+
+ public DeviceId deviceId() {
+ return deviceId;
+ }
+
+ public MeterId meterId() {
+ return id;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ MeterKey meterKey = (MeterKey) o;
+ return Objects.equal(deviceId, meterKey.deviceId) &&
+ Objects.equal(id, meterKey.id);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(deviceId, id);
+ }
+
+ public static MeterKey key(DeviceId deviceId, MeterId id) {
+ return new MeterKey(deviceId, id);
+ }
+}
diff --git a/core/api/src/main/java/org/onosproject/net/meter/MeterService.java b/core/api/src/main/java/org/onosproject/net/meter/MeterService.java
index bdc90eb..2e07cb6 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/MeterService.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/MeterService.java
@@ -16,6 +16,7 @@
package org.onosproject.net.meter;
import org.onosproject.event.ListenerService;
+import org.onosproject.net.DeviceId;
import java.util.Collection;
@@ -46,10 +47,11 @@
/**
* Fetch the meter by the meter id.
*
+ * @param deviceId a device id
* @param id a meter id
* @return a meter
*/
- Meter getMeter(MeterId id);
+ Meter getMeter(DeviceId deviceId, MeterId id);
/**
* Fetches all the meters.
diff --git a/core/api/src/main/java/org/onosproject/net/meter/MeterStore.java b/core/api/src/main/java/org/onosproject/net/meter/MeterStore.java
index 5112a4a..f429e95 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/MeterStore.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/MeterStore.java
@@ -57,12 +57,12 @@
void updateMeterState(Meter meter);
/**
- * Obtains a meter matching the given meter id.
+ * Obtains a meter matching the given meter key.
*
- * @param meterId a meter id
+ * @param key a meter key
* @return a meter
*/
- Meter getMeter(MeterId meterId);
+ Meter getMeter(MeterKey key);
/**
* Returns all meters stored in the store.