| commit | 9ea7276ed9178af5775d58ce50f8f824d2409adc | [log] [tgz] |
|---|---|---|
| author | FrankWang <wangpeihuixyz@126.com> | Tue Apr 17 15:36:49 2018 +0800 |
| committer | FrankWang <wangpeihuixyz@126.com> | Tue Apr 17 15:36:49 2018 +0800 |
| tree | a39e38ad766bd929fd0da1d9264ad6b461ca270d | |
| parent | a7be50dc8856d223d49ef3157f763461cade2a8c [diff] |
minor fix for P4Runtime meter Change-Id: Ieaf843f0fb86e9ea42c906940d4733c8733f399a
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),