Fix IOS TypeError * if flags are None, then ' '.join(flags) fails * fixed get_defaults_flag so that it returns a list, and ignores lines with white space Fixes #26918pull/4420/head
parent
0b5b5ec50a
commit
9f64e446c6
|
@ -71,13 +71,13 @@ def get_defaults_flag(module):
|
|||
|
||||
commands = set()
|
||||
for line in out.splitlines():
|
||||
if line:
|
||||
if line.strip():
|
||||
commands.add(line.strip().split()[0])
|
||||
|
||||
if 'all' in commands:
|
||||
return 'all'
|
||||
return ['all']
|
||||
else:
|
||||
return 'full'
|
||||
return ['full']
|
||||
|
||||
|
||||
def get_config(module, flags=[]):
|
||||
|
|
|
@ -343,7 +343,7 @@ def get_running_config(module, current_config=None):
|
|||
if not module.params['defaults'] and current_config:
|
||||
contents, banners = extract_banners(current_config.config_text)
|
||||
else:
|
||||
flags = get_defaults_flag(module) if module.params['defaults'] else None
|
||||
flags = get_defaults_flag(module) if module.params['defaults'] else []
|
||||
contents = get_config(module, flags=flags)
|
||||
contents, banners = extract_banners(contents)
|
||||
return NetworkConfig(indent=1, contents=contents), banners
|
||||
|
|
Loading…
Reference in New Issue