From 7f21167a594d7b8116ce089b5490666eb8dedc48 Mon Sep 17 00:00:00 2001
From: dongxiancun <dongxiancun@cmhi.chinamobile.com>
Date: Mon, 26 Aug 2019 16:54:38 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20aaa-12=20=E4=BF=AE=E5=A4=8D=E5=8D=8E?=
 =?UTF-8?q?=E4=B8=BA=E8=AE=BE=E5=A4=87=E6=97=A0=E6=B3=95=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20RCA=EF=BC=9A=20SOL?=
 =?UTF-8?q?=EF=BC=9A=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Adongxiancun=20?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Adongxiancun?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmcc/cmhi/huawei/impl/HuaweiNetconfSpeaker.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 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 419535675..55146d1fe 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
@@ -106,7 +106,9 @@ 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()));
+                .setPort(new PortNumber(connectDevice.getPort().getValue()))
+                .setTcpOnly(false)
+                .setSchemaless(false);
         String username = connectDevice.getUserName();
         String password = connectDevice.getPassword();
         if (Strings.isNullOrEmpty(username) || Strings.isNullOrEmpty(password)) {
@@ -210,7 +212,11 @@ public class HuaweiNetconfSpeaker implements DataTreeChangeListener<ConnectorInf
             } else if (rootNode.getModificationType() == DELETE) {
                 LOG.info("onDataTreeChanged - Toaster config with path {} was deleted: old Toaster: {}",
                         change.getRootPath().getRootIdentifier(), rootNode.getDataBefore());
-                disConnectDevice(device.getId().getValue());
+                ConnectorInfo oldEntry = rootNode.getDataBefore();
+                oldEntry.getRemoteDevices().forEach( d -> {
+                    disConnectDevice(d.getId().getValue());
+                });
+
             }
         }
     }
@@ -302,6 +308,7 @@ public class HuaweiNetconfSpeaker implements DataTreeChangeListener<ConnectorInf
         InstanceIdentifier<CpuInfos> iid =
                 InstanceIdentifier.create(Devm.class).child(CpuInfos.class);
         Optional<CpuInfos> cupInfos;
+        LOG.info("开始向华为设备获取cpu信息！");
         try {
             // Read from a transaction is asynchronous, but a simple
             // get/checkedGet makes the call synchronous