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

added a couple more checks

Browse source
This commit is contained in:
d3justi 2016-09-17 14:32:03 -05:00
parent d34f7c24d9
commit 07f3b27351
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/module_utils/nxos.py
View file

@ -201,14 +201,20 @@ class Nxapi(NxapiConfigMixin):
for cmd in commands: for cmd in commands:
if output and output != cmd.output: if output and output != cmd.output:
responses.extend(self.execute(cmds, output=output)) try:
responses.extend(self.execute(cmds, output=output))
except ValueError:
responses.extend(self.execute(cmds))
cmds = list() cmds = list()
output = cmd.output output = cmd.output
cmds.append(str(cmd)) cmds.append(str(cmd))
if cmds: if cmds:
responses.extend(self.execute(cmds, output=output)) try:
responses.extend(self.execute(cmds, output=output))
except ValueError:
responses.extend(self.execute(cmds))
return responses return responses
@ -217,7 +223,10 @@ class Nxapi(NxapiConfigMixin):
def configure(self, commands): def configure(self, commands):
commands = to_list(commands) commands = to_list(commands)
return self.execute(commands, output='config') try:
return self.execute(commands, output='config')
except ValueError:
return self.execute(commands)
def _jsonify(self, data): def _jsonify(self, data):
for encoding in ("utf-8", "latin-1"): for encoding in ("utf-8", "latin-1"):