From bde1e8ea1af0ffec65dc774b1e2b720552654e10 Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Sat, 4 Jul 2020 15:35:02 +0800 Subject: [PATCH] Fix the error message when reached max number of traits The error message is not properly tranlated as desired, raw string is returned when reached maximum number of traits. Change-Id: I62b2d32c545b6ad6487aead98c8fab212ed5e83f (cherry picked from commit d90459a87fce4a84d34bdf24604de3edfb23dda7) --- ironic/db/sqlalchemy/api.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index e3f62335f2..cf46fef96c 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -1515,12 +1515,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):