From: Jakub Morvay <jmorvay@cisco.com>
Date: Fri, 18 Aug 2017 08:28:03 +0000 (+0200)
Subject: Bug 8989 - Create just one DS for each test-tool's simulated netconf device
X-Git-Tag: release/carbon-sr2~3
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=d4a44ff4b699cc19840be70a5b29d8fc7f8f1d47;p=netconf.git

Bug 8989 - Create just one DS for each test-tool's simulated netconf device

When using netconf test-tool with option --md-sal set to true, we expect
that each test-tool's simulated netconf device will have its own md-sal
persistent datastore. However, current implementation creates own
datastore for each netconf session.

Map newly created simulated device's datastore to its server socket
instead of netconf session's socket.

Change-Id: I2d5a0295c8cbff6d29baafa36bdbbe6aba8119c6
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
(cherry picked from commit c65ab49a8a2f72446e13e0bb0f8395722c455c6b)
---

diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java
index 44e2d4e814..df1dc70740 100644
--- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java
+++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/NetconfServerSessionNegotiatorFactory.java
@@ -100,7 +100,7 @@ public class NetconfServerSessionNegotiatorFactory implements SessionNegotiatorF
         }
 
         return new NetconfServerSessionNegotiator(proposal, promise, channel, timer,
-                getListener(Long.toString(sessionId), channel.localAddress()), connectionTimeoutMillis);
+                getListener(Long.toString(sessionId), channel.parent().localAddress()), connectionTimeoutMillis);
     }
 
     private NetconfServerSessionListener getListener(final String netconfSessionIdForReporting, final SocketAddress socketAddress) {