From: Ed Warnicke <eaw@cisco.com>
Date: Thu, 16 Jan 2014 16:01:08 +0000 (+0000)
Subject: Merge "Added extended ietf-netconf-monitoring detection for Netconf devices"
X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~79
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=23ab6602499bbc5b1ab01216df5893607d54a306;hp=5fc6be7797623953af15373143b74c27385d25ee

Merge "Added extended ietf-netconf-monitoring detection for Netconf devices"
---

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 da0790c599..21500e1da6 100644
--- 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
@@ -146,7 +146,9 @@ AutoCloseable {
             var SchemaSourceProvider<String> delegate;
             if (NetconfRemoteSchemaSourceProvider.isSupportedFor(initialCapabilities)) {
                 delegate = new NetconfRemoteSchemaSourceProvider(this);
-            }  else {
+            }  else if(client.capabilities.contains(NetconfRemoteSchemaSourceProvider.IETF_NETCONF_MONITORING.namespace.toString)) {
+                delegate = new NetconfRemoteSchemaSourceProvider(this);
+            } else {
                 logger.info("Netconf server {} does not support IETF Netconf Monitoring", socketAddress);
                 delegate = SchemaSourceProviders.<String>noopProvider();
             }
@@ -317,6 +319,7 @@ package class NetconfDeviceSchemaContextProvider {
     new(NetconfDevice device, SchemaSourceProvider<InputStream> sourceProvider) {
         _device = device
         _sourceProvider = sourceProvider
+        _currentContext = Optional.absent();
     }
 
     def createContextFromCapabilities(Iterable<QName> capabilities) {