Moving meter store implementation to use map events
Change-Id: I338473b7286d7b9e5cdfb938f16c7b6155d4cbb5
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/meter/MeterEvent.java b/incubator/api/src/main/java/org/onosproject/incubator/net/meter/MeterEvent.java
index 9439145..808a3e8 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/meter/MeterEvent.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/meter/MeterEvent.java
@@ -20,28 +20,19 @@
/**
* Entity that represents Meter events.
*/
-public class MeterEvent extends AbstractEvent<MeterEvent.Type, MeterOperation> {
+public class MeterEvent extends AbstractEvent<MeterEvent.Type, Meter> {
- private final MeterFailReason reason;
-
public enum Type {
+ /**
+ * A meter addition was requested.
+ */
+ METER_ADD_REQ,
/**
- * Signals that a meter has been added.
+ * A meter removal was requested.
*/
- METER_UPDATED,
-
- /**
- * Signals that a meter update failed.
- */
- METER_OP_FAILED,
-
- /**
- * A meter operation was requested.
- */
- METER_OP_REQ,
-
+ METER_REM_REQ
}
@@ -50,32 +41,22 @@
* current time.
*
* @param type meter event type
- * @param op event subject
+ * @param meter event subject
*/
- public MeterEvent(Type type, MeterOperation op) {
- super(type, op);
- this.reason = null;
+ public MeterEvent(Type type, Meter meter) {
+ super(type, meter);
}
/**
* Creates an event of a given type and for the specified meter and time.
*
* @param type meter event type
- * @param op event subject
+ * @param meter event subject
* @param time occurrence time
*/
- public MeterEvent(Type type, MeterOperation op, long time) {
- super(type, op, time);
- this.reason = null;
+ public MeterEvent(Type type, Meter meter, long time) {
+ super(type, meter, time);
}
- public MeterEvent(Type type, MeterOperation op, MeterFailReason reason) {
- super(type, op);
- this.reason = reason;
- }
-
- public MeterFailReason reason() {
- return reason;
- }
}