[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/web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java b/web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
index d7db030..e9efb18 100644
--- a/web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
+++ b/web/api/src/test/java/org/onosproject/rest/resources/MetersResourceTest.java
@@ -442,7 +442,7 @@
public void testMeterSingleDeviceWithId() {
setupMockMeters();
- expect(mockMeterService.getMeter(anyObject(), anyObject()))
+ expect(mockMeterService.getMeter(anyObject(), anyObject(MeterCellId.class)))
.andReturn(meter5).anyTimes();
replay(mockMeterService);
replay(mockDeviceService);
@@ -467,7 +467,7 @@
public void testMeterByDeviceIdAndMeterId() {
setupMockMeters();
- expect(mockMeterService.getMeter(anyObject(), anyObject()))
+ expect(mockMeterService.getMeter(anyObject(), anyObject(MeterCellId.class)))
.andReturn(null).anyTimes();
replay(mockMeterService);
@@ -526,9 +526,7 @@
@Test
public void testDelete() {
setupMockMeters();
- expect(mockMeterService.getMeter(anyObject(), anyObject()))
- .andReturn(meter5).anyTimes();
- mockMeterService.withdraw(anyObject(), anyObject());
+ mockMeterService.withdraw(anyObject(), anyObject(MeterCellId.class));
expectLastCall();
replay(mockMeterService);