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

address minor bugs in nxos shared module

Browse source 
This addresses two issues with the nxos shared module.  The first issue is
argument precedence checking.  The module should prefer explicit arguments
over arguments passed vi the provider.  This is now fixed to honor that
precedence.  The second issue is collecting output from nxapi and returning
the response.  Prior to this change the entire json structure was returned.
Now just the output is returned to align it better with cli based output
This commit is contained in:
Peter Sprygada 2016-01-27 11:09:40 -05:00
parent c59916c43d
commit 4fa6902c96
1 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ NET_COMMON_ARGS = dict(
port=dict(type='int'), port=dict(type='int'),
username=dict(required=True), username=dict(required=True),
password=dict(no_log=True), password=dict(no_log=True),
transport=dict(choices=['cli', 'nxapi']), transport=dict(default='cli', choices=['cli', 'nxapi']),
use_ssl=dict(default=False, type='bool'), use_ssl=dict(default=False, type='bool'),
provider=dict() provider=dict()
) )
@ -107,11 +107,24 @@ class Nxapi(object):
self.module.fail_json(**headers) self.module.fail_json(**headers)
response = self.module.from_json(response.read()) response = self.module.from_json(response.read())
if 'error' in response: result = list()
err = response['error']
self.module.fail_json(msg='json-rpc error % ' % str(err))
return response output = response['ins_api']['outputs']['output']
if isinstance(output, list):
for item in response['ins_api']['outputs']['output']:
if item['code'] != '200':
self.module.fail_json(msg=item['msg'], command=item['input'],
code=item['code'])
else:
result.append(item['body'])
elif output['code'] != '200':
self.module.fail_json(msg=item['msg'], command=item['input'],
code=item['code'])
else:
result.append(output['body'])
return result
class Cli(object): class Cli(object):
@ -150,6 +163,7 @@ class NetworkModule(AnsibleModule):
provider = params.get('provider') or dict() provider = params.get('provider') or dict()
for key, value in provider.items(): for key, value in provider.items():
if key in NET_COMMON_ARGS.keys(): if key in NET_COMMON_ARGS.keys():
if not params.get(key) and value is not None:
params[key] = value params[key] = value
return params return params
@ -159,11 +173,9 @@ class NetworkModule(AnsibleModule):
else: else:
self.connection = Cli(self) self.connection = Cli(self)
try:
self.connection.connect() self.connection.connect()
if self.params['transport'] == 'cli':
self.execute('terminal length 0') self.execute('terminal length 0')
except Exception, exc:
self.fail_json(msg=exc.message)
def configure(self, commands): def configure(self, commands):
commands = to_list(commands) commands = to_list(commands)
@ -176,10 +188,7 @@ class NetworkModule(AnsibleModule):
return responses return responses
def execute(self, commands, **kwargs): def execute(self, commands, **kwargs):
try:
return self.connection.send(commands, **kwargs) return self.connection.send(commands, **kwargs)
except Exception, exc:
self.fail_json(msg=exc.message)
def disconnect(self): def disconnect(self):
self.connection.close() self.connection.close()
@ -194,10 +203,7 @@ class NetworkModule(AnsibleModule):
if self.params['transport'] == 'cli': if self.params['transport'] == 'cli':
return self.execute(cmd)[0] return self.execute(cmd)[0]
else: else:
resp = self.execute(cmd) return self.execute(cmd)
if not resp.get('ins_api').get('outputs').get('output').get('body'):
self.fail_json(msg="Unrecognized response: %s" % str(resp))
return resp['ins_api']['outputs']['output']['body']
def get_module(**kwargs): def get_module(**kwargs):
"""Return instance of NetworkModule """Return instance of NetworkModule