[SDFAB-355] Revisit MeterService and north abstractions

Change-Id: I685cb90d53f8aa61017ecda9fa7ff842e58e2940
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;