[SDFAB-500][SDFAB-527] Meters cleanup and leftovers
- Improve ONOS cli enabling CRUD of p4rt trtcm
- Improve ONOS rest enabling CRUD of p4rt trtcm
- Improve MeterService with scope defined reads and integrate in cli/rest
- Add support along the stack for BYTE_PER_SEC unit
- Add support along the stack for COMMITTED and PEAK bands
- Fix several bugs in ONOS cli/rest interfaces
- Improve REST codecs
- Fix NPE in MeterDriverProvider
- Improve PiMeterTransalation by enforcing trtcm config
- Implement explicit translation of the bands
- Fix ONOS reconciliation by removing from the mirror the wrong configs
- Remove unnecessary checks in MeterEntryCodec
- Update unit tests
It will follow a 2nd patch to complete SDFAB-527
Change-Id: I855235b17f60cb1d39f5b9a042c1015105a8a269
diff --git a/core/api/src/main/java/org/onosproject/net/meter/Band.java b/core/api/src/main/java/org/onosproject/net/meter/Band.java
index 9f9479c..befbead 100644
--- a/core/api/src/main/java/org/onosproject/net/meter/Band.java
+++ b/core/api/src/main/java/org/onosproject/net/meter/Band.java
@@ -51,8 +51,27 @@
* Defines a meter band with no action, used to mark
* packets internally in the pipeline, i.e. without
* modifying the packet headers.
+ *
+ * @deprecated in onos-2.5, replace by MARK_YELLOW and MARK_RED
*/
+ @Deprecated
NONE,
+
+ /**
+ * Defines a meter band for the configuration of the committed
+ * rate AND the committed burst size. Used in conjunction with MARK_RED
+ * to implement a srTCM or trTCM, see RFCs 2697 and 2698 respectively.
+ */
+ MARK_YELLOW,
+
+ /**
+ * Defines a meter band for the configuration of the peak rate
+ * AND the peak burst size OR the excess burst size. When used to
+ * configure a srTCM excess rate must be 0. Used in conjunction with
+ * MARK_YELLOW to implement a srTCM or trTCM, see RFCs 2697 and 2698
+ * respectively.
+ */
+ MARK_RED,
}
/**
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 0dbd4f7..617151d 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
@@ -33,8 +33,6 @@
*/
public final class DefaultMeterRequest extends AbstractAnnotated implements MeterRequest {
-
-
private final ApplicationId appId;
private final Meter.Unit unit;
private final boolean burst;
@@ -122,6 +120,8 @@
}
public static final class Builder implements MeterRequest.Builder {
+ // Relevant only for delete
+ private static final Band DUMMY_BAND = new DefaultBand(Band.Type.DROP, 0L, 0L, (short) 0);
private ApplicationId appId;
private Meter.Unit unit = Meter.Unit.KB_PER_SEC;
@@ -196,6 +196,11 @@
@Override
public MeterRequest remove() {
+ // Allow to create the removal request without specifying bands
+ if (bands == null || bands.isEmpty()) {
+ bands = ImmutableSet.of(DUMMY_BAND);
+ }
+
validate();
return new DefaultMeterRequest(deviceId, appId, unit, burst, bands, context,
Type.REMOVE, scope, desiredIndex, annotations);
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 5b3ca3b..2d37f87 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
@@ -91,6 +91,15 @@
Collection<Meter> getMeters(DeviceId deviceId);
/**
+ * Fetches the meters by the device id and scope.
+ *
+ * @param deviceId a device id
+ * @param scope meters scope
+ * @return a collection of meters
+ */
+ Collection<Meter> getMeters(DeviceId deviceId, MeterScope scope);
+
+ /**
* Allocates a new meter id in the system.
*
* @param deviceId the device id
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 7f4de4b..4abf233 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
@@ -118,6 +118,17 @@
Collection<Meter> getAllMeters(DeviceId deviceId);
/**
+ * Returns all meters stored in the store for a
+ * precise device and scope.
+ *
+ * @param deviceId a device id
+ * @param scope meters scope
+ * @return an immutable copy of the meters stored for a given device
+ * withing a given scope
+ */
+ Collection<Meter> getAllMeters(DeviceId deviceId, MeterScope scope);
+
+ /**
* Update the store by deleting the failed meter.
* Notifies the delegate that the meter failed to allow it
* to nofity the app.