summaryrefslogtreecommitdiff
path: root/ironic/common
diff options
context:
space:
mode:
authorDmitry Tantsur <dtantsur@protonmail.com>2022-08-30 12:15:42 +0200
committerDmitry Tantsur <dtantsur@protonmail.com>2022-08-30 12:22:19 +0200
commit62f9c61ae6657227fd1f5dbc86c59a22b6bac28f (patch)
tree4207240060356243893dd55ef6a36e4d376a1328 /ironic/common
parent9f1f58c6af3aabcb3ae56e5f7b292f07e81e2864 (diff)
downloadironic-62f9c61ae6657227fd1f5dbc86c59a22b6bac28f.tar.gz
Improve error message heuristics with jsonschema>=4.8
Before version 4.8, jsonschema did some wild guessing when producing error messages for schemas with several equivalent subschemas. In version 4.8 it is no longer done, causing error messages that are more correct but also more generic. This change restores guessing the potential root cause without claiming that it's the only possible root cause. Also the traits schema is simplified to make it less ambiguous. See https://github.com/python-jsonschema/jsonschema/issues/991 for details. Change-Id: Ia75cecd2bfbc602b8b2b85bdda20fdc04c5eadf4
Diffstat (limited to 'ironic/common')
-rwxr-xr-xironic/common/args.py17
1 files changed, 11 insertions, 6 deletions
diff --git a/ironic/common/args.py b/ironic/common/args.py
index 94cfe8841..bd13e3eaf 100755
--- a/ironic/common/args.py
+++ b/ironic/common/args.py
@@ -211,12 +211,17 @@ def _validate_schema(name, value, schema):
try:
jsonschema.validate(value, schema)
except jsonschema.exceptions.ValidationError as e:
-
- # The error message includes the whole schema which can be very
- # large and unhelpful, so truncate it to be brief and useful
- error_msg = ' '.join(str(e).split("\n")[:3])[:-1]
- raise exception.InvalidParameterValue(
- _('Schema error for %s: %s') % (name, error_msg))
+ error_msg = _('Schema error for %s: %s') % (name, e.message)
+ # Sometimes the root message is too generic, try to find a possible
+ # root cause:
+ cause = None
+ current = e
+ while current.context:
+ current = jsonschema.exceptions.best_match(current.context)
+ cause = current.message
+ if cause is not None:
+ error_msg += _('. Possible root cause: %s') % cause
+ raise exception.InvalidParameterValue(error_msg)
return value