| commit | 616d9349bff467d0244d37c19d34c259e33483a2 | [log] [tgz] |
|---|---|---|
| author | FrankWang <wangpeihuixyz@126.com> | Tue Apr 17 15:36:49 2018 +0800 |
| committer | Yi Tseng <a86487817@gmail.com> | Wed Apr 18 04:03:02 2018 +0000 |
| tree | da4c5b1a3b3c3a86828b77b58d232950517e508f | |
| parent | bad1660b7b62e16ab5f12249953ca76c08e19935 [diff] |
minor fix for P4Runtime meter Change-Id: Ieaf843f0fb86e9ea42c906940d4733c8733f399a (cherry picked from commit 9ea7276ed9178af5775d58ce50f8f824d2409adc)
diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/MeterEntryCodec.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/MeterEntryCodec.java index fc60dcd..a830f6d 100644 --- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/MeterEntryCodec.java +++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/MeterEntryCodec.java
@@ -290,7 +290,7 @@ if (entity.getEntityCase() == METER_ENTRY) { String meterName = browser.meters() - .getById(entity.getCounterEntry().getCounterId()) + .getById(entity.getMeterEntry().getMeterId()) .getPreamble() .getName(); piCellId = PiMeterCellId.ofIndirect(
diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java index e8b4e21..cd988fd 100644 --- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java +++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeClientImpl.java
@@ -245,6 +245,8 @@ public CompletableFuture<Boolean> sendMasterArbitrationUpdate() { return supplyInContext(this::doArbitrationUpdate, "arbitrationUpdate"); } + + @Override public CompletableFuture<Boolean> writeMeterCells(Collection<PiMeterCellConfig> cellIds, PiPipeconf pipeconf) { return supplyInContext(() -> doWriteMeterCells(cellIds, pipeconf),