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 "Bug 1593 - Flow Statistics manager is updating store with incorrect key Statis...
[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 4b9592570565fc94d423702a7cff9923d110895f..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
@@
-29,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;
}
@@
-62,6
+62,7
@@
final class MeterConfigStatsTracker extends AbstractListeningStatsTracker<MeterC
return item;
}
return item;
}
+ @Override
public void request() {
if (meterStatsService != null) {
GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder();
public void request() {
if (meterStatsService != null) {
GetAllMeterConfigStatisticsInputBuilder input = new GetAllMeterConfigStatisticsInputBuilder();
@@
-81,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);
}
}
@@
-108,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;
+ }
}
}