[SDFAB-542] Meters cleanup and leftovers v2
- Code clean up (unused code, unuseful comments)
- Remove deprecated internal APIs
- Prevent the ejection of the meter pollers
- Prevent the ejection of the mf pollers
- Fix unproper filter of device events
- Fix delete on store which updated existing meters with dummy value
- Fix NPE in TofinoMeterProgrammable caused by default config
- Update unit tests
Change-Id: Ib2767e3ab3cf146693e61b7e1890419c9743d521
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 b903fa3..2230893 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
@@ -220,13 +220,14 @@
log.warn("Meter Cell Config obtained from device {} is different from " +
"one in in translation store: device={}, store=Default", deviceId, config);
} else {
- log.debug("Configs obtained from device: {} and present in the store are default, " +
- "skipping the forge section", deviceId);
+ log.debug("Configs for {} obtained from device: {} and from the store are default, " +
+ "skipping the forge section", config.cellId(), deviceId);
}
return null;
}
- // The config is not consistent
+ // The config is not consistent. MeterProgrammable should remember
+ // that config from devices can be default which means no band
if (!isSimilar(translatedEntity.get().translated(), config)) {
log.warn("Meter Cell Config obtained from device {} is different from " +
"one in in translation store: device={}, store={}",
@@ -243,7 +244,6 @@
Meter original = translatedEntity.get().original();
// Forge a meter with MeterCellId, Bands and DeviceId using the original value.
- // Other values are not required because we cannot retrieve them from the south
DefaultMeter meter = (DefaultMeter) DefaultMeter.builder()
.withBands(original.bands())
.withCellId(original.meterCellId())