[SDFAB-355] Revisit MeterService and north abstractions
Change-Id: I685cb90d53f8aa61017ecda9fa7ff842e58e2940
diff --git a/core/protobuf/models/proto/net/meter/MeterEnumsProto.proto b/core/protobuf/models/proto/net/meter/MeterEnumsProto.proto
index 1b0bbf5..63a35b6 100644
--- a/core/protobuf/models/proto/net/meter/MeterEnumsProto.proto
+++ b/core/protobuf/models/proto/net/meter/MeterEnumsProto.proto
@@ -28,6 +28,11 @@
* Kilo bits per second.
*/
KB_PER_SEC = 1;
+
+ /**
+ * Bytes per second.
+ */
+ BYTES_PER_SEC = 2;
}
enum MeterStateProto {
@@ -45,11 +50,6 @@
* The meter is in the process of being removed.
*/
PENDING_REMOVE = 2;
-
- /**
- * The meter has been removed.
- */
- REMOVED = 3;
}
enum MeterRequestTypeProto {
diff --git a/core/protobuf/models/src/main/java/org/onosproject/incubator/protobuf/models/net/meter/MeterEnumsProtoTranslator.java b/core/protobuf/models/src/main/java/org/onosproject/incubator/protobuf/models/net/meter/MeterEnumsProtoTranslator.java
index b73117c..bb416de 100644
--- a/core/protobuf/models/src/main/java/org/onosproject/incubator/protobuf/models/net/meter/MeterEnumsProtoTranslator.java
+++ b/core/protobuf/models/src/main/java/org/onosproject/incubator/protobuf/models/net/meter/MeterEnumsProtoTranslator.java
@@ -42,6 +42,8 @@
return Optional.of(Meter.Unit.PKTS_PER_SEC);
case KB_PER_SEC:
return Optional.of(Meter.Unit.KB_PER_SEC);
+ case BYTES_PER_SEC:
+ return Optional.of(Meter.Unit.BYTES_PER_SEC);
default:
log.warn("Unrecognized MeterUnit gRPC message: {}", unit);
return Optional.empty();
@@ -60,6 +62,8 @@
return MeterEnumsProto.MeterUnitProto.PKTS_PER_SEC;
case KB_PER_SEC:
return MeterEnumsProto.MeterUnitProto.KB_PER_SEC;
+ case BYTES_PER_SEC:
+ return MeterEnumsProto.MeterUnitProto.BYTES_PER_SEC;
default:
log.warn("Unrecognized MeterUnit ONOS message: {}", unit);
return MeterEnumsProto.MeterUnitProto.UNRECOGNIZED;
@@ -80,8 +84,6 @@
return MeterEnumsProto.MeterStateProto.ADDED;
case PENDING_REMOVE:
return MeterEnumsProto.MeterStateProto.PENDING_REMOVE;
- case REMOVED:
- return MeterEnumsProto.MeterStateProto.REMOVED;
default:
log.warn("Unrecognized MeterState ONOS message: {}", meterState);
return MeterEnumsProto.MeterStateProto.UNRECOGNIZED;