diff options
author | Zuul <zuul@review.opendev.org> | 2020-07-06 09:25:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2020-07-06 09:25:34 +0000 |
commit | d2fbc066612837fb663f6fa54379df547e55419c (patch) | |
tree | 970cc548d8f1fac0c0312a801bd5605f1ce5b540 | |
parent | 36ea661bfca3db9454f6d8927ac2cf346087696b (diff) | |
parent | d90459a87fce4a84d34bdf24604de3edfb23dda7 (diff) | |
download | ironic-d2fbc066612837fb663f6fa54379df547e55419c.tar.gz |
Merge "Fix the error message when reached max number of traits"
-rw-r--r-- | ironic/db/sqlalchemy/api.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index e8f4c737a..a0ca90ef1 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -1520,12 +1520,12 @@ class Connection(api.Connection): per-node trait limit. """ if num_traits > MAX_TRAITS_PER_NODE: - msg = _("Could not modify traits for node %(node_id)s as it would " - "exceed the maximum number of traits per node " - "(%(num_traits)d vs. %(max_traits)d)") - raise exception.InvalidParameterValue( - msg, node_id=node_id, num_traits=num_traits, - max_traits=MAX_TRAITS_PER_NODE) + msg = (_("Could not modify traits for node %(node_id)s as it " + "would exceed the maximum number of traits per node " + "(%(num_traits)d vs. %(max_traits)d)") + % {'node_id': node_id, 'num_traits': num_traits, + 'max_traits': MAX_TRAITS_PER_NODE}) + raise exception.InvalidParameterValue(err=msg) @oslo_db_api.retry_on_deadlock def set_node_traits(self, node_id, traits, version): |