cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Backport/2.8/59689 ce_netstream_global: update to fix a bug. (#59689) (#59786)

Browse source 
* ce_netstream_global: update to fix a bug. (#59689)

* update to fix a bug.

* Update ce_netstream_global.py

(cherry picked from commit 3c7e8f7905)

* add a changelog fragment.
This commit is contained in:
Xu Yuandong 2019-07-31 08:25:01 +08:00 committed by Toshio Kuratomi
parent 11e087ff7a
commit 77df9ddaa8
2 changed files with 48 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/59786-ce_netstream_global-to-fix-bugs.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- ce_netstream_global - The 'get_config', which is from 'ansible.module_utils.network.cloudengine.ce', try to return the result from cache,however the configure has changed. (https://github.com/ansible/ansible/pull/59689)

59
lib/ansible/modules/network/cloudengine/ce_netstream_global.py
View file

@ -213,7 +213,8 @@ changed:
''' '''
from ansible.module_utils.basic import AnsibleModule 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 load_config
from ansible.module_utils.network.cloudengine.ce import get_connection, rm_config_prefix
from ansible.module_utils.network.cloudengine.ce import ce_argument_spec from ansible.module_utils.network.cloudengine.ce import ce_argument_spec
@ -247,6 +248,38 @@ def get_interface_type(interface):
return iftype.lower() return iftype.lower()
def get_config(module, flags):
"""Retrieves the current config from the device or cache
"""
flags = [] if flags is None else flags
if isinstance(flags, str):
flags = [flags]
elif not isinstance(flags, list):
flags = []
cmd = 'display current-configuration '
cmd += ' '.join(flags)
cmd = cmd.strip()
conn = get_connection(module)
rc, out, err = conn.exec_command(cmd)
if rc != 0:
module.fail_json(msg=err)
cfg = str(out).strip()
# remove default configuration prefix '~'
for flag in flags:
if "include-default" in flag:
cfg = rm_config_prefix(cfg)
break
if cfg.startswith('display'):
lines = cfg.split('\n')
if len(lines) > 1:
return '\n'.join(lines[1:])
else:
return ''
return cfg
class NetStreamGlobal(object): class NetStreamGlobal(object):
""" """
Manages netstream global parameters. Manages netstream global parameters.
@ -342,8 +375,8 @@ class NetStreamGlobal(object):
self.existing["sampler"].append(sampler_tmp) self.existing["sampler"].append(sampler_tmp)
if self.interface != "all": if self.interface != "all":
flags = list() flags = list()
exp = " | ignore-case section include ^interface %s$" \ exp = r" | ignore-case section include ^#\s+interface %s" \
" | include netstream sampler random-packets" % self.interface r" | include netstream sampler random-packets" % self.interface
flags.append(exp) flags.append(exp)
config = get_config(self.module, flags) config = get_config(self.module, flags)
if not config: if not config:
@ -376,8 +409,8 @@ class NetStreamGlobal(object):
statistic_tmp1["statistics_record"] = list() statistic_tmp1["statistics_record"] = list()
statistic_tmp1["interface"] = self.interface statistic_tmp1["interface"] = self.interface
flags = list() flags = list()
exp = " | ignore-case section include ^interface %s$" \ exp = r" | ignore-case section include ^#\s+interface %s" \
" | include netstream record"\ r" | include netstream record"\
% (self.interface) % (self.interface)
flags.append(exp) flags.append(exp)
config = get_config(self.module, flags) config = get_config(self.module, flags)
@ -414,8 +447,8 @@ class NetStreamGlobal(object):
statistic_tmp1 = dict() statistic_tmp1 = dict()
statistic_tmp1["statistics_direction"] = list() statistic_tmp1["statistics_direction"] = list()
flags = list() flags = list()
exp = " | ignore-case section include ^interface %s$" \ exp = r" | ignore-case section include ^#\s+interface %s" \
" | include netstream inbound|outbound"\ r" | include netstream inbound|outbound"\
% self.interface % self.interface
flags.append(exp) flags.append(exp)
config = get_config(self.module, flags) config = get_config(self.module, flags)
@ -501,8 +534,8 @@ class NetStreamGlobal(object):
self.end_state["sampler"].append(sampler_tmp) self.end_state["sampler"].append(sampler_tmp)
if self.interface != "all": if self.interface != "all":
flags = list() flags = list()
exp = " | ignore-case section include ^interface %s$" \ exp = r" | ignore-case section include ^#\s+interface %s" \
" | include netstream sampler random-packets" % self.interface r" | include netstream sampler random-packets" % self.interface
flags.append(exp) flags.append(exp)
config = get_config(self.module, flags) config = get_config(self.module, flags)
if not config: if not config:
@ -535,8 +568,8 @@ class NetStreamGlobal(object):
statistic_tmp1["statistics_record"] = list() statistic_tmp1["statistics_record"] = list()
statistic_tmp1["interface"] = self.interface statistic_tmp1["interface"] = self.interface
flags = list() flags = list()
exp = " | ignore-case section include ^interface %s$" \ exp = r" | ignore-case section include ^#\s+interface %s" \
" | include netstream record"\ r" | include netstream record"\
% (self.interface) % (self.interface)
flags.append(exp) flags.append(exp)
config = get_config(self.module, flags) config = get_config(self.module, flags)
@ -573,8 +606,8 @@ class NetStreamGlobal(object):
statistic_tmp1 = dict() statistic_tmp1 = dict()
statistic_tmp1["statistics_direction"] = list() statistic_tmp1["statistics_direction"] = list()
flags = list() flags = list()
exp = " | ignore-case section include ^interface %s$" \ exp = r" | ignore-case section include ^#\s+interface %s" \
" | include netstream inbound|outbound"\ r" | include netstream inbound|outbound"\
% self.interface % self.interface
flags.append(exp) flags.append(exp)
config = get_config(self.module, flags) config = get_config(self.module, flags)