From da8ec327cc20b72f68b049de6a0b53b088fc15dd Mon Sep 17 00:00:00 2001
From: Xu Yuandong <yuandongdeyouxiang@gmail.com>
Date: Thu, 21 Nov 2019 05:18:24 +0800
Subject: [PATCH]  Update plugins/netconf/ce.py to fix a bug(failed to get
 veriosn information via neocnf). (#65065)

* fix version fail.

* add a changelog fragment.

* Update ce.py

* Rename plugins-netconf-ce-fix.yaml to 65065-plugins-netconf-ce-fix.yaml

* Update ce.py
---
 .../65065-plugins-netconf-ce-fix.yaml         |  3 ++
 lib/ansible/plugins/netconf/ce.py             | 28 +++++++++++++------
 2 files changed, 23 insertions(+), 8 deletions(-)
 create mode 100644 changelogs/fragments/65065-plugins-netconf-ce-fix.yaml

diff --git a/changelogs/fragments/65065-plugins-netconf-ce-fix.yaml b/changelogs/fragments/65065-plugins-netconf-ce-fix.yaml
new file mode 100644
index 00000000000..591fb38b179
--- /dev/null
+++ b/changelogs/fragments/65065-plugins-netconf-ce-fix.yaml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - plugins-netconf-ce - Fix failed to get version information.
diff --git a/lib/ansible/plugins/netconf/ce.py b/lib/ansible/plugins/netconf/ce.py
index 3d58f71a717..46b3bc2725d 100644
--- a/lib/ansible/plugins/netconf/ce.py
+++ b/lib/ansible/plugins/netconf/ce.py
@@ -54,14 +54,26 @@ class Netconf(NetconfBase):
     def get_device_info(self):
         device_info = dict()
         device_info['network_os'] = 'ce'
-        ele = new_ele('get-software-information')
-        data = self.execute_rpc(to_xml(ele))
-        reply = to_ele(to_bytes(data, errors='surrogate_or_strict'))
-        sw_info = reply.find('.//software-information')
-
-        device_info['network_os_version'] = self.get_text(sw_info, 'ce-version')
-        device_info['network_os_hostname'] = self.get_text(sw_info, 'host-name')
-        device_info['network_os_model'] = self.get_text(sw_info, 'product-model')
+        filter_xml = '''<filter type="subtree">
+                          <system xmlns="http://www.huawei.com/netconf/vrp" content-version="1.0" format-version="1.0">
+                            <systemInfo>
+                              <sysName></sysName>
+                              <sysContact></sysContact>
+                              <productVer></productVer>
+                              <platformVer></platformVer>
+                              <productName></productName>
+                            </systemInfo>
+                          </system>
+                        </filter>'''
+        data = self.get(filter_xml)
+        data = re.sub(r'xmlns=".+?"', r'', data)
+        reply = fromstring(to_bytes(data, errors='surrogate_or_strict'))
+        sw_info = reply.find('.//systemInfo')
+
+        device_info['network_os_version'] = self.get_text(sw_info, 'productVer')
+        device_info['network_os_hostname'] = self.get_text(sw_info, 'sysName')
+        device_info['network_os_platform_version'] = self.get_text(sw_info, 'platformVer')
+        device_info['network_os_platform'] = self.get_text(sw_info, 'productName')
 
         return device_info