X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderers%2Fvpp%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Frenderer%2Fvpp%2Futil%2FGbpVppNetconfConnectionProbe.java;h=255a624c305864fbaa595bd6aaf7df5365a2239b;hb=d86dd59e06109eb52e1e0d23a0909729db2f5255;hp=b4d078f1bb5fa889be05ca1b22579ecd7485acd6;hpb=ce0039c64d1d726a06f38f3fafbfe717edbe2c81;p=groupbasedpolicy.git

diff --git a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/GbpVppNetconfConnectionProbe.java b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/GbpVppNetconfConnectionProbe.java
index b4d078f1b..255a624c3 100644
--- a/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/GbpVppNetconfConnectionProbe.java
+++ b/renderers/vpp/src/main/java/org/opendaylight/groupbasedpolicy/renderer/vpp/util/GbpVppNetconfConnectionProbe.java
@@ -13,6 +13,7 @@ import static org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topolog
 
 import javax.annotation.Nonnull;
 import java.util.Collection;
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.SettableFuture;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
@@ -64,10 +65,12 @@ class GbpVppNetconfConnectionProbe implements ClusteredDataTreeChangeListener<No
         changes.forEach(modification -> {
             final DataObjectModification<Node> rootNode = modification.getRootNode();
             final Node node = rootNode.getDataAfter();
-            final NetconfNode netconfNode = getNodeAugmentation(node);
-            if (node == null || node.getNodeId() == null) {
+            if (node == null) {
+                futureStatus.set(false);
+                unregister();
                 return;
             }
+            final NetconfNode netconfNode = getNodeAugmentation(node);
             final NodeId nodeId = node.getNodeId();
             if (netconfNode == null || netconfNode.getConnectionStatus() == null) {
                 LOG.warn("Node {} does not contain netconf augmentation", nodeId);
@@ -99,11 +102,15 @@ class GbpVppNetconfConnectionProbe implements ClusteredDataTreeChangeListener<No
         return netconfNode;
     }
 
-    private void unregister() {
+    void unregister() {
         LOG.debug("Listener for path {} unregistered", path.getRootIdentifier());
         if (registeredListener != null) {
             registeredListener.close();
         }
     }
 
+    @VisibleForTesting
+    SettableFuture<Boolean> getFutureStatus() {
+        return futureStatus;
+    }
 }