BUG-2343 Report sideloaded models for nc correctly 80/16380/2
authorMaros Marsalek <mmarsale@cisco.com>
Thu, 12 Mar 2015 09:57:00 +0000 (10:57 +0100)
committerMaros Marsalek <mmarsale@cisco.com>
Thu, 12 Mar 2015 10:00:50 +0000 (10:00 +0000)
commit37cd74c147bf4fea8f08ca92fa8f2b97c762bfaf
treec97dd731d813cf2bd11189270600c7ffa79b750f
parent9db24f2b887db47a63e56579ecdd6839b0a31b55
BUG-2343 Report sideloaded models for nc correctly

The sideloading of models behaved as a merge operation but was reported as
replace. Report the resulting models as a merge.

Change-Id: Id44d077e72ae0ce5f202c5178d5c7e5b825d6deb
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfDeviceCommunicator.java
opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionPreferences.java
opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/listener/NetconfSessionPreferencesTest.java