X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fstatistics-manager%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fstatistics%2Fmanager%2FGroupDescStatsTracker.java;h=a775b73169dc5581cd3175eebfa078a471d5dbd3;hp=90702e4818fad9504c2f73af6ab14f43154f4acc;hb=66249d6ccc367fad055a269f561860d2d96af385;hpb=fd3193d2efe85828156e6a670b5c06a0ea485a98

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 90702e4818..a775b73169 100644
--- 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
@@ -7,9 +7,10 @@
  */
 package org.opendaylight.controller.md.statistics.manager;
 
+import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent;
+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.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupDescriptionInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupDescStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupDescStatsBuilder;
@@ -19,17 +20,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupKey;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.ListenableFuture;
-
-final class GroupDescStatsTracker extends AbstractStatsTracker<GroupDescStats, GroupDescStats> {
+final class GroupDescStatsTracker extends AbstractListeningStatsTracker<GroupDescStats, GroupDescStats> {
+    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);
-        this.groupStatsService = Preconditions.checkNotNull(groupStatsService);
+    public GroupDescStatsTracker(OpendaylightGroupStatisticsService groupStatsService, final FlowCapableContext context) {
+        super(context);
+        this.groupStatsService = groupStatsService;
     }
 
     @Override
@@ -58,10 +60,58 @@ final class GroupDescStatsTracker extends AbstractStatsTracker<GroupDescStats, G
         trans.removeOperationalData(groupRef);
     }
 
-    public ListenableFuture<TransactionId> request() {
-        final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder();
-        input.setNode(getNodeRef());
+    @Override
+    protected InstanceIdentifier<?> listenPath() {
+        return getNodeIdentifierBuilder().augmentation(FlowCapableNode.class).child(Group.class).build();
+    }
+
+    @Override
+    protected String statName() {
+        return "Group Descriptor";
+    }
+
+    @Override
+    public void request() {
+        if (groupStatsService != null) {
+            final GetGroupDescriptionInputBuilder input = new GetGroupDescriptionInputBuilder();
+            input.setNode(getNodeRef());
+
+            requestHelper(groupStatsService.getGroupDescription(input.build()));
+        }
+    }
+
+    @Override
+    public void onDataChanged(DataChangeEvent<InstanceIdentifier<?>, DataObject> change) {
+        for (InstanceIdentifier<?> key : change.getCreatedConfigurationData().keySet()) {
+            if (Group.class.equals(key.getTargetType())) {
+                logger.debug("Key {} triggered request", key);
+                request();
+            } else {
+                logger.debug("Ignoring key {}", key);
+            }
+        }
+
+        final DataModificationTransaction trans = startTransaction();
+        for (InstanceIdentifier<?> key : change.getRemovedConfigurationData()) {
+            if (Group.class.equals(key.getTargetType())) {
+                @SuppressWarnings("unchecked")
+                InstanceIdentifier<Group> group = (InstanceIdentifier<Group>)key;
+                InstanceIdentifier<?> del = group.augmentation(NodeGroupDescStats.class);
+                logger.debug("Key {} triggered remove of augmentation {}", key, del);
+
+                trans.removeOperationalData(del);
+            }
+        }
+        trans.commit();
+    }
+
+    @Override
+    public void start(final DataBrokerService dbs) {
+        if (groupStatsService == null) {
+            logger.debug("No Group Statistics service, not subscribing to groups on node {}", getNodeIdentifier());
+            return;
+        }
 
-        return requestHelper(groupStatsService.getGroupDescription(input.build()));
+        super.start(dbs);
     }
 }