don't retrieve config in running_config when config is provided for diff (#41400)

* don't retrieve config in running_config when config is provided for diff

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* fix for eos, nxos

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>

* add integration test

Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>
This commit is contained in:
Trishna Guha 2018-06-14 18:02:19 +05:30 committed by GitHub
commit 8ab0d654f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 106 additions and 6 deletions

View file

@ -410,7 +410,7 @@ def main():
result['changed'] = True
running_config = None
running_config = module.params['running_config']
startup_config = None
diff_ignore_lines = module.params['diff_ignore_lines']
@ -435,7 +435,7 @@ def main():
output = run_commands(module, {'command': 'show running-config', 'output': 'text'})
contents = output[0]
else:
contents = running_config.config_text
contents = running_config
# recreate the object in order to process diff_ignore_lines
running_config = NetworkConfig(indent=1, contents=contents, ignore_lines=diff_ignore_lines)

View file

@ -447,7 +447,7 @@ def main():
result['changed'] = True
running_config = None
running_config = module.params['running_config']
startup_config = None
diff_ignore_lines = module.params['diff_ignore_lines']
@ -470,7 +470,7 @@ def main():
output = run_commands(module, 'show running-config')
contents = output[0]
else:
contents = running_config.config_text
contents = running_config
# recreate the object in order to process diff_ignore_lines
running_config = NetworkConfig(indent=1, contents=contents, ignore_lines=diff_ignore_lines)

View file

@ -444,7 +444,7 @@ def main():
result['changed'] = True
running_config = None
running_config = module.params['running_config']
startup_config = None
diff_ignore_lines = module.params['diff_ignore_lines']
@ -467,7 +467,7 @@ def main():
output = execute_show_commands(module, 'show running-config')
contents = output[0]
else:
contents = running_config.config_text
contents = running_config
# recreate the object in order to process diff_ignore_lines
running_config = NetworkConfig(indent=1, contents=contents, ignore_lines=diff_ignore_lines)