internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Aruba indenting (#33884)

Browse Source 
* Fixing aruba's inconsitent indenting.

* Adding config with different children indentation and unit test to confirm the different spacing does not matter.

* Fixing pylint check. Missed an r prefix.
This commit is contained in:
James Mighion
2017-12-14 01:07:34 -08:00
committed by Ganesh Nalawade
parent 53abf45cec
commit f8e3cfe9e2
4 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ansible/modules/network/aruba/aruba_config.py
View File

@@ -233,11 +233,11 @@ def get_running_config(module, config=None):
contents = config
else:
contents = get_config(module)
return NetworkConfig(indent=1, contents=contents)
return NetworkConfig(contents=contents)
def get_candidate(module):
candidate = NetworkConfig(indent=1)
candidate = NetworkConfig()
if module.params['src']:
candidate.load(module.params['src'])
@@ -307,7 +307,7 @@ def main():
if module.params['backup'] or (module._diff and module.params['diff_against'] == 'running'):
contents = get_config(module)
config = NetworkConfig(indent=1, contents=contents)
config = NetworkConfig(contents=contents)
if module.params['backup']:
result['__backup__'] = contents
@@ -354,8 +354,8 @@ def main():
elif module.params['save_when'] == 'modified':
output = run_commands(module, ['show running-config', 'show startup-config'])
running_config = NetworkConfig(indent=1, contents=output[0], ignore_lines=diff_ignore_lines)
startup_config = NetworkConfig(indent=1, contents=output[1], ignore_lines=diff_ignore_lines)
running_config = NetworkConfig(contents=output[0], ignore_lines=diff_ignore_lines)
startup_config = NetworkConfig(contents=output[1], ignore_lines=diff_ignore_lines)
if running_config.sha1 != startup_config.sha1:
save_config(module, result)
@@ -371,7 +371,7 @@ def main():
contents = running_config.config_text
# recreate the object in order to process diff_ignore_lines
running_config = NetworkConfig(indent=1, contents=contents, ignore_lines=diff_ignore_lines)
running_config = NetworkConfig(contents=contents, ignore_lines=diff_ignore_lines)
if module.params['diff_against'] == 'running':
if module.check_mode:
@@ -391,7 +391,7 @@ def main():
contents = module.params['intended_config']
if contents is not None:
base_config = NetworkConfig(indent=1, contents=contents, ignore_lines=diff_ignore_lines)
base_config = NetworkConfig(contents=contents, ignore_lines=diff_ignore_lines)
if running_config.sha1 != base_config.sha1:
result.update({