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 "Removed `which` dependency, now using proper shell builtin."
[controller.git]
/
opendaylight
/
md-sal
/
statistics-manager
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
statistics
/
manager
/
GroupDescStatsTracker.java
diff --git
a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/GroupDescStatsTracker.java
b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/GroupDescStatsTracker.java
index 663269e25ff1660622fc6a979e5eee0492f890f4..a775b73169dc5581cd3175eebfa078a471d5dbd3 100644
(file)
--- a/
opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/GroupDescStatsTracker.java
+++ b/
opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/GroupDescStatsTracker.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 GroupDescStatsTracker extends AbstractListeningStatsTracker<GroupDes
private static final Logger logger = LoggerFactory.getLogger(GroupDescStatsTracker.class);
private final OpendaylightGroupStatisticsService groupStatsService;
private static final Logger logger = LoggerFactory.getLogger(GroupDescStatsTracker.class);
private final OpendaylightGroupStatisticsService groupStatsService;
- public GroupDescStatsTracker(OpendaylightGroupStatisticsService groupStatsService, final FlowCapableContext context
, final long lifetimeNanos
) {
- super(context
, lifetimeNanos
);
+ public GroupDescStatsTracker(OpendaylightGroupStatisticsService groupStatsService, final FlowCapableContext context) {
+ super(context);
this.groupStatsService = groupStatsService;
}
this.groupStatsService = groupStatsService;
}
@@
-71,12
+70,13
@@
final class GroupDescStatsTracker extends AbstractListeningStatsTracker<GroupDes
return "Group Descriptor";
}
return "Group Descriptor";
}
+ @Override
public void request() {
if (groupStatsService != null) {
final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder();
input.setNode(getNodeRef());
public void request() {
if (groupStatsService != null) {
final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder();
input.setNode(getNodeRef());
- requestHelper(groupStatsService.getGroupDescription(input.build())
, StatsRequestType.GROUP_DESC
);
+ requestHelper(groupStatsService.getGroupDescription(input.build()));
}
}
}
}
@@
-96,7
+96,7
@@
final class GroupDescStatsTracker extends AbstractListeningStatsTracker<GroupDes
if (Group.class.equals(key.getTargetType())) {
@SuppressWarnings("unchecked")
InstanceIdentifier<Group> group = (InstanceIdentifier<Group>)key;
if (Group.class.equals(key.getTargetType())) {
@SuppressWarnings("unchecked")
InstanceIdentifier<Group> group = (InstanceIdentifier<Group>)key;
- InstanceIdentifier<?> del =
InstanceIdentifier.builder(group).augmentation(NodeGroupDescStats.class).toInstance(
);
+ InstanceIdentifier<?> del =
group.augmentation(NodeGroupDescStats.class
);
logger.debug("Key {} triggered remove of augmentation {}", key, del);
trans.removeOperationalData(del);
logger.debug("Key {} triggered remove of augmentation {}", key, del);
trans.removeOperationalData(del);