From 4eaa8a81a8e8f1c8de851d5c348cc018be54eae6 Mon Sep 17 00:00:00 2001 From: yanzhangi <51999930+yanzhangi@users.noreply.github.com> Date: Sat, 12 Oct 2019 03:45:59 +0800 Subject: [PATCH] [Backport/2.8/61653]Update ce_netstream_aging to fix bugs (#62657) * Update ce_netstream_aging to fix bugs (#61653) * Update ce_netstream_aging to fix bugs * Update ce_netstream_aging to fix bugs (cherry picked from commit 80fa2a081634747be5ddd916ac41ae63591b9c6e) * Update ce_netstream_aging modified information --- .../61653-ce_netstream_aging-to-fix-bugs.yml | 2 ++ .../network/cloudengine/ce_netstream_aging.py | 21 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 changelogs/fragments/61653-ce_netstream_aging-to-fix-bugs.yml diff --git a/changelogs/fragments/61653-ce_netstream_aging-to-fix-bugs.yml b/changelogs/fragments/61653-ce_netstream_aging-to-fix-bugs.yml new file mode 100644 index 00000000000..9f220584028 --- /dev/null +++ b/changelogs/fragments/61653-ce_netstream_aging-to-fix-bugs.yml @@ -0,0 +1,2 @@ +bugfixes: +- ce_netstream_aging- update to fix some bugs - Modify the configured query statement and replace get_config with exec_command. (https://github.com/ansible/ansible/pull/61653) diff --git a/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py b/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py index 42ac8950dde..bdb478bcd1a 100644 --- a/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py +++ b/lib/ansible/modules/network/cloudengine/ce_netstream_aging.py @@ -192,7 +192,7 @@ changed: ''' from ansible.module_utils.basic import AnsibleModule -from ansible.module_utils.network.cloudengine.ce import get_config, load_config +from ansible.module_utils.network.cloudengine.ce import exec_command, load_config from ansible.module_utils.network.cloudengine.ce import ce_argument_spec @@ -273,10 +273,12 @@ class NetStreamAging(object): inactive_tmp["vxlan"] = "30" tcp_tmp["ip"] = "absent" tcp_tmp["vxlan"] = "absent" - flags = list() - exp = " | ignore-case include netstream timeout" - flags.append(exp) - config = get_config(self.module, flags) + + cmd = "display current-configuration | include ^netstream timeout" + rc, out, err = exec_command(self.module, cmd) + if rc != 0: + self.module.fail_json(msg=err) + config = str(out).strip() if config: config = config.lstrip() config_list = config.split('\n') @@ -313,10 +315,11 @@ class NetStreamAging(object): inactive_tmp["vxlan"] = "30" tcp_tmp["ip"] = "absent" tcp_tmp["vxlan"] = "absent" - flags = list() - exp = " | ignore-case include netstream timeout" - flags.append(exp) - config = get_config(self.module, flags) + cmd = "display current-configuration | include ^netstream timeout" + rc, out, err = exec_command(self.module, cmd) + if rc != 0: + self.module.fail_json(msg=err) + config = str(out).strip() if config: config = config.lstrip() config_list = config.split('\n')