fixes issue where netcli would cause exception with an invalid conditional

The Conditional instance will cause a stack trace if the provided conditional
does not map properly to the response.  This fixes that issue so that the
Conditional instance will now raise a FailedConditionalError with the
conditional that caused the failure.

Modules *_command modules (and any other modules that create an instance
of Conditional) should be updated to catch the FailedConditionalError
exception.

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