From ac4301942ac8f58c63472ee5e3625c7331a5f57d Mon Sep 17 00:00:00 2001
From: maxiaonan <maxiaonan@cmhi.chinamobile.com>
Date: Fri, 23 Aug 2019 16:31:57 +0800
Subject: [PATCH] =?UTF-8?q?Add=20aaa-12=20fix=20netconf=20node=20propertie?=
 =?UTF-8?q?s=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9Amaxiaonan=20=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cmcc/cmhi/huawei/impl/HuaweiNetconfSpeaker.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ControlPlatform/driver-layer/drivers/huawei/src/main/java/com/cmcc/cmhi/huawei/impl/HuaweiNetconfSpeaker.java b/ControlPlatform/driver-layer/drivers/huawei/src/main/java/com/cmcc/cmhi/huawei/impl/HuaweiNetconfSpeaker.java
index 59ac91c38..419535675 100644
--- a/ControlPlatform/driver-layer/drivers/huawei/src/main/java/com/cmcc/cmhi/huawei/impl/HuaweiNetconfSpeaker.java
+++ b/ControlPlatform/driver-layer/drivers/huawei/src/main/java/com/cmcc/cmhi/huawei/impl/HuaweiNetconfSpeaker.java
@@ -98,6 +98,7 @@ public class HuaweiNetconfSpeaker implements DataTreeChangeListener<ConnectorInf
         InstanceIdentifier<ConnectorInfo> connectPath = InstanceIdentifier.create(ConnectorInfo.class);
         final DataTreeIdentifier<ConnectorInfo> dataTreeIdentifier = new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, connectPath);
         configurationReg = dataBroker.registerDataTreeChangeListener(dataTreeIdentifier, this);
+        LOG.info("HuaweiNetconfSpeaker Session Initiated");
     }
 
 
@@ -105,9 +106,7 @@ public class HuaweiNetconfSpeaker implements DataTreeChangeListener<ConnectorInf
         /**create netconf node with connect device information */
         final NetconfNodeBuilder netconfNodeBuilder = new NetconfNodeBuilder();
         netconfNodeBuilder.setHost(new Host(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress(connectDevice.getIp().getIpv4Address())))
-                .setPort(new PortNumber(connectDevice.getPort().getValue()))
-                .setTcpOnly(true)
-                .setSchemaless(true);
+                .setPort(new PortNumber(connectDevice.getPort().getValue()));
         String username = connectDevice.getUserName();
         String password = connectDevice.getPassword();
         if (Strings.isNullOrEmpty(username) || Strings.isNullOrEmpty(password)) {
@@ -259,10 +258,12 @@ public class HuaweiNetconfSpeaker implements DataTreeChangeListener<ConnectorInf
             readInfoFromDevice(nodeId);
         }, 0, 10000, TimeUnit.MILLISECONDS);
         if (Objects.nonNull(threads.get(nodeId))) {
+            LOG.info("remove exist pool in thread map");
             if (!threads.get(nodeId).isShutdown()) {
                 threads.get(nodeId).shutdownNow();
             }
         }
+        LOG.info("put pool in thread map with key {}",nodeId);
         threads.put(nodeId, pool);
     }