Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Datastore: Reuse successful future"
[controller.git]
/
opendaylight
/
md-sal
/
statistics-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
statistics
/
manager
/
MeterConfigStatsTracker.java
diff --git
a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MeterConfigStatsTracker.java
b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MeterConfigStatsTracker.java
index a32fc220ecebb8e099ba82ab951f7a5d65678b9b..88139fc60649541678f63edb46e8f9a250898644 100644
(file)
--- a/
opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MeterConfigStatsTracker.java
+++ b/
opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/MeterConfigStatsTracker.java
@@
-8,7
+8,6
@@
package org.opendaylight.controller.md.statistics.manager;
import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
package org.opendaylight.controller.md.statistics.manager;
import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
-import org.opendaylight.controller.md.statistics.manager.MultipartMessageManager.StatsRequestType;
import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
@@
-30,8
+29,8
@@
final class MeterConfigStatsTracker extends AbstractListeningStatsTracker<MeterC
private static final Logger logger = LoggerFactory.getLogger(MeterConfigStatsTracker.class);
private final OpendaylightMeterStatisticsService meterStatsService;
private static final Logger logger = LoggerFactory.getLogger(MeterConfigStatsTracker.class);
private final OpendaylightMeterStatisticsService meterStatsService;
- protected MeterConfigStatsTracker(OpendaylightMeterStatisticsService meterStatsService, final FlowCapableContext context
, long lifetimeNanos
) {
- super(context
, lifetimeNanos
);
+ protected MeterConfigStatsTracker(OpendaylightMeterStatisticsService meterStatsService, final FlowCapableContext context) {
+ super(context);
this.meterStatsService = meterStatsService;
}
this.meterStatsService = meterStatsService;
}
@@
-63,12
+62,13
@@
final class MeterConfigStatsTracker extends AbstractListeningStatsTracker<MeterC
return item;
}
return item;
}
+ @Override
public void request() {
if (meterStatsService != null) {
GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder();
input.setNode(getNodeRef());
public void request() {
if (meterStatsService != null) {
GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder();
input.setNode(getNodeRef());
- requestHelper(meterStatsService.getAllMeterConfigStatistics(input.build())
, StatsRequestType.METER_CONFIG
);
+ requestHelper(meterStatsService.getAllMeterConfigStatistics(input.build()));
}
}
}
}
@@
-82,7
+82,7
@@
final class MeterConfigStatsTracker extends AbstractListeningStatsTracker<MeterC
InstanceIdentifier<Meter> meter = (InstanceIdentifier<Meter>)key;
InstanceIdentifier<?> nodeMeterStatisticsAugmentation =
InstanceIdentifier<Meter> meter = (InstanceIdentifier<Meter>)key;
InstanceIdentifier<?> nodeMeterStatisticsAugmentation =
-
InstanceIdentifier.builder(meter).augmentation(NodeMeterConfigStats.class).toInstance(
);
+
meter.augmentation(NodeMeterConfigStats.class
);
trans.removeOperationalData(nodeMeterStatisticsAugmentation);
}
}
trans.removeOperationalData(nodeMeterStatisticsAugmentation);
}
}
@@
-109,4
+109,10
@@
final class MeterConfigStatsTracker extends AbstractListeningStatsTracker<MeterC
super.start(dbs);
}
super.start(dbs);
}
+
+ @Override
+ protected MeterConfigStats createInvariantKey(MeterConfigStats item) {
+ // No invariant data exist in the meter config stats.
+ return item;
+ }
}
}