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

Merge pull request #17638 from privateip/fix-netcli

Browse source 
fixes issue where netcli would cause exception with an invalid conditional
This commit is contained in:
Peter Sprygada 2016-09-19 14:46:13 -04:00 committed by GitHub
commit b38181116b
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/module_utils/netcli.py
View file

@ -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'))