BUG-732 Fix netconf-connector unable to detect monitoring capability

Change-Id: I6d84db9994a85116d6159d960908c0816f31461b
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend
index 12e8b5587caa230cb693610d21f8135f61e9e2e9..0b88c66b4569404f0c8604b9cbac582340ead1a0 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDevice.xtend
@@ -167,8 +167,10 @@ AutoCloseable {
             commitHandlerReg = mountInstance.registerCommitHandler(ROOT_PATH, this);
 
             val rpcs = new ArrayList<RpcRegistration>();
-            for (rpc : mountInstance.schemaContext.operations) {
-                rpcs.add(mountInstance.addRpcImplementation(rpc.QName, this));
+            if (mountInstance != null && schemaContext.isPresent) {
+                for (rpc : mountInstance.schemaContext.operations) {
+                    rpcs.add(mountInstance.addRpcImplementation(rpc.QName, this));
+                }
             }
             rpcReg = rpcs
         }

diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceListener.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceListener.java
index d5e1d35d7d5721e06b9b515822813b54feac779f..8c65aa309f125bd1d17bb7efde317f54a0b6cc60 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceListener.java
+++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfDeviceListener.java
@@ -63,6 +63,7 @@ class NetconfDeviceListener implements NetconfClientSessionListener {
         LOG.debug("Session with {} established as address {} session-id {}",
                 device.getName(), device.getSocketAddress(), session.getSessionId());
 
+        this.session = session;
         final Set<QName> caps = device.getCapabilities(session.getServerCapabilities());
         LOG.trace("Server {} advertized capabilities {}", device.getName(), caps);
 
@@ -70,7 +71,8 @@ class NetconfDeviceListener implements NetconfClientSessionListener {
         final SchemaSourceProvider<String> delegate;
         if (NetconfRemoteSchemaSourceProvider.isSupportedFor(caps)) {
             delegate = new NetconfRemoteSchemaSourceProvider(device);
-        } else if(caps.contains(NetconfRemoteSchemaSourceProvider.IETF_NETCONF_MONITORING.getNamespace().toString())) {
+            // FIXME parsed caps contain only module-based capabilities
+        } else if(session.getServerCapabilities().contains(NetconfRemoteSchemaSourceProvider.IETF_NETCONF_MONITORING.getNamespace().toString())) {
             delegate = new NetconfRemoteSchemaSourceProvider(device);
         } else {
             LOG.info("Netconf server {} does not support IETF Netconf Monitoring", device.getName());
@@ -79,7 +81,6 @@ class NetconfDeviceListener implements NetconfClientSessionListener {
 
         device.bringUp(delegate, caps);
 
-        this.session = session;
     }
 
     private synchronized void tearDown(final Exception e) {