diff options
author | Peter Sprygada <privateip@users.noreply.github.com> | 2016-09-19 14:46:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-19 14:46:13 -0400 |
commit | b38181116ba13b5a60df710703cd3b85cee6d2a3 (patch) | |
tree | b71706a59759053d3f87f7c9c0162c1f6edfbb06 | |
parent | 5e9a8d9202a32315df0ede6dcbe218a0709541f5 (diff) | |
parent | 1a8ad2a20f91a9482497176949b170275b5bf8c0 (diff) | |
download | ansible-b38181116ba13b5a60df710703cd3b85cee6d2a3.tar.gz |
Merge pull request #17638 from privateip/fix-netcli
fixes issue where netcli would cause exception with an invalid conditional
-rw-r--r-- | lib/ansible/module_utils/netcli.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ansible/module_utils/netcli.py b/lib/ansible/module_utils/netcli.py index d92e952cb6..10a544f5b4 100644 --- a/lib/ansible/module_utils/netcli.py +++ b/lib/ansible/module_utils/netcli.py @@ -47,6 +47,11 @@ class FailedConditionsError(Exception): super(FailedConditionsError, self).__init__(msg) self.failed_conditions = failed_conditions +class FailedConditionalError(Exception): + def __init__(self, msg, failed_conditional): + super(FailedConditionalError, self).__init__(msg) + self.failed_conditional = failed_conditional + class AddCommandError(Exception): def __init__(self, msg, command): super(AddCommandError, self).__init__(msg) @@ -216,7 +221,12 @@ class Conditional(object): def get_value(self, result): if self.encoding in ['json', 'text']: - return self.get_json(result) + try: + return self.get_json(result) + except (IndexError, TypeError): + msg = 'unable to apply conditional to result' + raise FailedConditionalError(msg, self.key) + elif self.encoding == 'xml': return self.get_xml(result.get('result')) |