| commit | 1d8c5e829883d2faf6ec78920f592527ed38b5dc | [log] [tgz] |
|---|---|---|
| author | Wailok Shum <wailok@opennetworking.org> | Mon Sep 13 17:23:20 2021 +0800 |
| committer | pierventre <pier@opennetworking.org> | Wed Sep 15 12:02:26 2021 +0200 |
| tree | cd3befc6d29d6e94492aee4d7e2cc5929f6a1a42 | |
| parent | 89984ebcf98647f7de0943b5f31f01d690e027ba [diff] [blame] |
[SDFAB-557] Fix max meter in ONOS Change-Id: I17f1b760fb4c16e3c0daa0ed0a4e54009b5e9aaf
diff --git a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeMeterProgrammable.java b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeMeterProgrammable.java index 5165783..b903fa3 100644 --- a/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeMeterProgrammable.java +++ b/drivers/p4runtime/src/main/java/org/onosproject/drivers/p4runtime/P4RuntimeMeterProgrammable.java
@@ -314,9 +314,13 @@ // The scope value will be PiMeterId .withScope(MeterScope.of(piMeterModel.id().id())) .withMaxBands(PI_METER_MAX_BAND) - .withMaxColors(PI_METER_MAX_COLOR) - .withStartIndex(PI_METER_START_INDEX) - .withEndIndex(piMeterModel.size() - 1); + .withMaxColors(PI_METER_MAX_COLOR); + + // We extract the number of supported meters. + if (piMeterModel.size() > 0) { + builder.withStartIndex(PI_METER_START_INDEX) + .withEndIndex(piMeterModel.size() - 1); + } // p4rt meters support MARK_YELLOW (committed config) and // MARK_RED (peak config) band types.