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

adds exception handling for adding an invalid condition (#5125)

Browse source 
This change will now handle a problem adding a condition that raises
an AddConditionError and return a well formed error to the user.
This commit is contained in:
Peter Sprygada 2016-10-02 16:46:38 -04:00 committed by Matt Clay
parent b405931e8b
commit 9c664f424e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/network/junos/junos_command.py
View file

@ -158,7 +158,7 @@ from ansible.module_utils.basic import get_exception
from ansible.module_utils.network import NetworkModule, NetworkError
from ansible.module_utils.netcli import CommandRunner
from ansible.module_utils.netcli import AddCommandError, FailedConditionsError
from ansible.module_utils.netcli import FailedConditionalError
from ansible.module_utils.netcli import FailedConditionalError, AddConditionError
from ansible.module_utils.junos import xml_to_json
from ansible.module_utils.six import string_types
@ -261,9 +261,9 @@ def main():
try:
for item in conditionals:
runner.add_conditional(item)
except (ValueError, AttributeError):
except (ValueError, AddConditionError):
exc = get_exception()
module.fail_json(msg=str(exc))
module.fail_json(msg=str(exc), condition=exc.condition)
runner.retries = module.params['retries']
runner.interval = module.params['interval']