cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix up eos_eapi module

Browse source 
* fixes TypeError: load_config() got an unexpected keyword argument 'session'\n"
* removes qos argument

ref #4869
This commit is contained in:
Peter Sprygada 2016-09-16 22:09:58 -04:00 committed by Matt Clay
parent d75c2ea475
commit 989793483f
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/ansible/modules/network/eos/eos_eapi.py
View file

@ -113,14 +113,6 @@ options:
required: false required: false
default: default default: default
version_added: "2.2" version_added: "2.2"
qos:
description:
- The C(qos) argument configures the IP DSCP value to assign to
eAPI response packets. This argument accepts integer values
in the valid IP DSCP range of 0 to 63.
required: false
default: 0
version_added: "2.2"
config: config:
description: description:
- The module, by default, will connect to the remote device and - The module, by default, will connect to the remote device and
@ -256,11 +248,6 @@ def set_vrf(module, commands):
module.fail_json(msg="vrf '%s' is not configured" % vrf) module.fail_json(msg="vrf '%s' is not configured" % vrf)
commands.append('vrf %s' % vrf) commands.append('vrf %s' % vrf)
def set_qos(module, commands):
if not 0 <= module.params['qos'] <= 63:
module.fail_json(msg='qos must be between 0 and 63')
commands.append('qos dscp %s' % module.params['qos'])
def get_config(module): def get_config(module):
contents = module.params['config'] contents = module.params['config']
if not contents: if not contents:
@ -270,17 +257,11 @@ def get_config(module):
return config return config
def load_config(module, commands, result): def load_config(module, commands, result):
session = 'ansible_%s' % int(time.time())
commit = not module.check_mode commit = not module.check_mode
diff = module.config.load_config(commands, commit=commit)
diff = module.config.load_config(commands, session=session, commit=commit) if diff:
result['diff'] = dict(prepared=diff)
# once the configuration is done, remove the config session and result['changed'] = True
# remove the session name from the result
module.cli(['no configure session %s' % session])
result['diff'] = dict(prepared=diff)
result['changed'] = diff is not None
def load(module, commands, result): def load(module, commands, result):
candidate = NetworkConfig(indent=3) candidate = NetworkConfig(indent=3)
@ -330,12 +311,11 @@ def main():
socket=dict(aliases=['enable_socket'], default=False, type='bool'), socket=dict(aliases=['enable_socket'], default=False, type='bool'),
vrf=dict(default='default'), vrf=dict(default='default'),
qos=dict(default=0, type='int'),
config=dict(), config=dict(),
# Only allow use of transport cli when configuring eAPI # Only allow use of transport cli when configuring eAPI
transport=dict(required=True, choices=['cli']), transport=dict(default='cli', choices=['cli']),
state=dict(default='started', choices=['stopped', 'started']), state=dict(default='started', choices=['stopped', 'started']),
) )