[VOL-2525] Fixing the OLT app meter removal and optimizing the bandwith profile to meter map with a Multimap
Change-Id: I62b1fe58770df8f1a9e73a4b5bc1dec751d47ad9
diff --git a/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java b/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java
index 630ae4a..bf00b92 100644
--- a/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java
+++ b/app/src/main/java/org/opencord/olt/cli/ShowBpMeterMappingsCommand.java
@@ -22,7 +22,9 @@
import org.opencord.olt.internalapi.AccessDeviceMeterService;
import java.util.Map;
-import java.util.Set;
+import java.util.Collection;
+
+
@Command(scope = "onos", name = "volt-bpmeter-mappings",
description = "Shows information about bandwidthProfile-meterKey (device / meter) mappings")
@@ -31,11 +33,11 @@
@Override
protected void execute() {
AccessDeviceMeterService service = AbstractShellCommand.get(AccessDeviceMeterService.class);
- Map<String, Set<MeterKey>> bpMeterMappings = service.getBpMeterMappings();
+ Map<String, Collection<MeterKey>> bpMeterMappings = service.getBpMeterMappings();
bpMeterMappings.forEach(this::display);
}
- private void display(String bpInfo, Set<MeterKey> meterKeyList) {
+ private void display(String bpInfo, Collection<MeterKey> meterKeyList) {
meterKeyList.forEach(meterKey ->
print("bpInfo=%s deviceId=%s meterId=%s",
bpInfo, meterKey.deviceId(), meterKey.meterId()));