diff options
| author | zhu.fanglei <zhu.fanglei@zte.com.cn> | 2019-03-19 14:21:32 +0800 |
|---|---|---|
| committer | zhu.fanglei <zhu.fanglei@zte.com.cn> | 2019-03-19 14:21:32 +0800 |
| commit | 320a61b6856d829213aefd0e3703dd1effd3ef35 (patch) | |
| tree | 9149ae0ccd7f428cdddf5b3843eb1e8af55d7718 | |
| parent | ce110c5fb5bc0caf324b420084aa7330464a0159 (diff) | |
| download | ironic-320a61b6856d829213aefd0e3703dd1effd3ef35.tar.gz | |
Pass kwargs to exception to get better formatted error message
This is to pass kwargs to NodeNotFound, and to fix kwargs for
MissingParameterValue, to get better formatted error message.
Change-Id: I0efae0ed94741ebf7ca77904cc1e34230e65d5d5
| -rw-r--r-- | ironic/db/sqlalchemy/api.py | 6 | ||||
| -rw-r--r-- | ironic/drivers/modules/xclarity/common.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py index 6ca3f1504..23c29198c 100644 --- a/ironic/db/sqlalchemy/api.py +++ b/ironic/db/sqlalchemy/api.py @@ -449,7 +449,7 @@ class Connection(api.Connection): host=node['reservation']) return node except NoResultFound: - raise exception.NodeNotFound(node_id) + raise exception.NodeNotFound(node=node_id) @oslo_db_api.retry_on_deadlock def release_node(self, tag, node_id): @@ -468,7 +468,7 @@ class Connection(api.Connection): raise exception.NodeLocked(node=node.uuid, host=node['reservation']) except NoResultFound: - raise exception.NodeNotFound(node_id) + raise exception.NodeNotFound(node=node_id) @oslo_db_api.retry_on_deadlock def create_node(self, values): @@ -1090,7 +1090,7 @@ class Connection(api.Connection): query = add_identity_filter(query, node_id) count = query.update({'provision_updated_at': timeutils.utcnow()}) if count == 0: - raise exception.NodeNotFound(node_id) + raise exception.NodeNotFound(node=node_id) def _check_node_exists(self, node_id): if not model_query(models.Node).filter_by(id=node_id).scalar(): diff --git a/ironic/drivers/modules/xclarity/common.py b/ironic/drivers/modules/xclarity/common.py index d21619514..cd44d44d5 100644 --- a/ironic/drivers/modules/xclarity/common.py +++ b/ironic/drivers/modules/xclarity/common.py @@ -144,7 +144,7 @@ def get_server_hardware_id(node): msg = (_("Error validating node driver info, " "server uuid: %s missing xclarity_hardware_id") % node.uuid) - raise exception.MissingParameterValue(error=msg) + raise exception.MissingParameterValue(err=msg) return xclarity_hardware_id |