ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Add diff capability in vyos edit_config (#41950)

Browse source 
* Add diff capability in vyos edit_config

Fetch onbox diff within edit_config cliconf
plugin and return it in response

* Remove diff returned from ios edit_config

* Fix CI failure

* More CI fixes
This commit is contained in:
Ganesh Nalawade 2018-06-26 14:21:12 +05:30 • committed by GitHub
parent e60da3feaf
commit 9acb5780bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lib/ansible/plugins/cliconf/vyos.py
View file

@ -19,6 +19,7 @@
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import collections
import re
import json
@ -60,7 +61,7 @@ class Cliconf(CliconfBase):
out = self.send_command('show configuration commands')
return out
def edit_config(self, candidate=None, commit=True, replace=False, diff=False, comment=None):
def edit_config(self, candidate=None, commit=True, replace=False, comment=None):
resp = {}
if not candidate:
raise ValueError('must provide a candidate config to load')
@ -78,29 +79,32 @@ class Cliconf(CliconfBase):
results = []
for cmd in chain(['configure'], to_list(candidate)):
results.append(self.send_command(cmd))
if not isinstance(cmd, collections.Mapping):
cmd = {'command': cmd}
diff_config = None
if diff:
out = self.get('compare')
out = to_text(out, errors='surrogate_or_strict')
if not out.startswith('No changes'):
diff_config = out
results.append(self.send_command(**cmd))
if commit:
try:
self.commit(comment)
except AnsibleConnectionFailure as e:
msg = 'commit failed: %s' % e.message
self.discard_changes()
raise AnsibleConnectionFailure(msg)
out = self.get('compare')
out = to_text(out, errors='surrogate_or_strict')
diff_config = out if not out.startswith('No changes') else None
if diff_config:
if commit:
try:
self.commit(comment)
except AnsibleConnectionFailure as e:
msg = 'commit failed: %s' % e.message
self.discard_changes()
raise AnsibleConnectionFailure(msg)
else:
self.get('exit')
else:
self.get('exit')
self.discard_changes()
else:
self.discard_changes()
self.get('exit')
resp['diff'] = diff_config
resp['response'] = results[1:]
resp['response'] = results[1:-1]
return json.dumps(resp)
def get(self, command=None, prompt=None, answer=None, sendonly=False):