SEBA-1009-Minor version upgrade
Change-Id: I3fff2718ed28842872773fa0a93f73f127545f2f
diff --git a/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java b/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java
index d57f3c1..2acf10e 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltMeterService.java
@@ -77,7 +77,6 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
/**
* Provisions Meters on access devices.
@@ -113,9 +112,9 @@
protected ExecutorService eventExecutor;
- private Map<DeviceId, Set<BandwidthProfileInformation>> pendingMeters;
- private Map<DeviceId, Map<MeterKey, AtomicInteger>> pendingRemoveMeters;
- ConsistentMultimap<String, MeterKey> bpInfoToMeter;
+ protected Map<DeviceId, Set<BandwidthProfileInformation>> pendingMeters;
+ protected Map<DeviceId, Map<MeterKey, AtomicInteger>> pendingRemoveMeters;
+ protected ConsistentMultimap<String, MeterKey> bpInfoToMeter;
@Activate
public void activate(ComponentContext context) {
@@ -127,6 +126,7 @@
KryoNamespace serializer = KryoNamespace.newBuilder()
.register(KryoNamespaces.API)
.register(MeterKey.class)
+ .register(BandwidthProfileInformation.class)
.build();
bpInfoToMeter = storageService.<String, MeterKey>consistentMultimapBuilder()
@@ -137,8 +137,16 @@
meterService.addListener(meterListener);
componentConfigService.registerProperties(getClass());
- pendingMeters = Maps.newConcurrentMap();
- pendingRemoveMeters = Maps.newConcurrentMap();
+ pendingMeters = storageService.<DeviceId, Set<BandwidthProfileInformation>>consistentMapBuilder()
+ .withName("volt-pending-meters")
+ .withSerializer(Serializer.using(serializer))
+ .withApplicationId(appId)
+ .build().asJavaMap();
+ pendingRemoveMeters = storageService.<DeviceId, Map<MeterKey, AtomicInteger>>consistentMapBuilder()
+ .withName("volt-pending-remove-meters")
+ .withSerializer(Serializer.using(serializer))
+ .withApplicationId(appId)
+ .build().asJavaMap();
log.info("Olt Meter service started");
}