Merge "Use odl hello message capabilities" into stable/fluorine

diff --git a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java
index 9b057f06195202b444e9f2b19dfdbbbf091564cc..19ba294b2ce67abbd7014648cfb29677da91fec8 100644 (file)
--- a/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java
+++ b/netconf/netconf-topology/src/main/java/org/opendaylight/netconf/topology/AbstractNetconfTopology.java
@@ -517,6 +517,10 @@ public abstract class AbstractNetconfTopology implements NetconfTopology {
         } else {
             throw new IllegalStateException("Unsupported protocol type: " + node.getProtocol().getName().getClass());
         }
+        if (node.getOdlHelloMessageCapabilities() != null) {
+            reconnectingClientConfigurationBuilder
+                    .withOdlHelloCapabilities(node.getOdlHelloMessageCapabilities().getCapability());
+        }
 
         return reconnectingClientConfigurationBuilder
                 .withAddress(socketAddress)