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

nxos_udld_interface: improve interface detection (#28682)

Browse Source 
* fix for nxos_udld_interface

* Tested Note added back
This commit is contained in:
saichint
2017-09-13 11:06:56 -07:00
committed by Nathaniel Case
parent 6d196eaa98
commit 4e32c92166
2 changed files with 88 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ansible/module_utils/nxos.py
View File

@@ -157,7 +157,7 @@ class Cli:
responses.append(out)
return responses
def load_config(self, config):
def load_config(self, config, return_error=False):
"""Sends configuration commands to the remote device
"""
@@ -236,7 +236,7 @@ class Nxapi:
return dict(ins_api=msg)
def send_request(self, commands, output='text', check_status=True):
def send_request(self, commands, output='text', check_status=True, return_error=False):
# only 10 show commands can be encoded in each request
# messages sent to the remote device
if output != 'config':
@@ -287,7 +287,10 @@ class Nxapi:
output = response['ins_api']['outputs']['output']
for item in to_list(output):
if check_status and item['code'] != '200':
self._error(output=output, **item)
if return_error:
result.append(item)
else:
self._error(output=output, **item)
elif 'body' in item:
result.append(item['body'])
# else:
@@ -341,12 +344,15 @@ class Nxapi:
return responses
def load_config(self, commands):
def load_config(self, commands, return_error=False):
"""Sends the ordered set of commands to the device
"""
commands = to_list(commands)
self.send_request(commands, output='config')
return []
msg = self.send_request(commands, output='config', check_status=True, return_error=return_error)
if return_error:
return msg
else:
return []
def is_json(cmd):
@@ -397,6 +403,6 @@ def run_commands(module, commands, check_rc=True):
return conn.run_commands(to_command(module, commands), check_rc)
def load_config(module, config):
def load_config(module, config, return_error=False):
conn = get_connection(module)
return conn.load_config(config)
return conn.load_config(config, return_error=return_error)