diff --git a/cerberus/common/exception.py b/cerberus/common/exception.py index 7bff037..716ccb8 100644 --- a/cerberus/common/exception.py +++ b/cerberus/common/exception.py @@ -151,7 +151,7 @@ class ReportExists(DBException): class PluginInfoExists(DBException): - msg_fmt = _("Plugin info %(id)s already exists.") + msg_fmt = _("Plugin info %(plugin_id)s already exists.") class AlarmExists(DBException): diff --git a/cerberus/db/sqlalchemy/api.py b/cerberus/db/sqlalchemy/api.py index 513d269..1009393 100644 --- a/cerberus/db/sqlalchemy/api.py +++ b/cerberus/db/sqlalchemy/api.py @@ -90,7 +90,7 @@ def _security_report_create(values): security_report_ref.save() except db_exc.DBDuplicateEntry as e: LOG.exception(e) - raise exception.ReportExists(id=values['id']) + raise exception.ReportExists(report_id=values['report_id']) except Exception as e: LOG.exception(e) raise exception.DBException() @@ -191,7 +191,7 @@ def _plugin_info_create(values): plugin_info_ref.update(values) plugin_info_ref.save() except db_exc.DBDuplicateEntry: - raise exception.PluginInfoExists(id=values['id']) + raise exception.PluginInfoExists(plugin_id=values['id']) except Exception as e: LOG.exception(e) raise exception.DBException() @@ -274,7 +274,7 @@ def _security_alarm_create(values): security_alarm_ref.save() except db_exc.DBDuplicateEntry as e: LOG.exception(e) - raise exception.AlarmExists(id=values['id']) + raise exception.AlarmExists(alarm_id=values['id']) except Exception as e: LOG.exception(e) raise exception.DBException() @@ -341,7 +341,7 @@ def _create_task(values): task_ref.save() except db_exc.DBDuplicateEntry as e: LOG.exception(e) - raise exception.TaskExists(id=values['uuid']) + raise exception.TaskExists(task_id=values['uuid']) except Exception as e: LOG.exception(e) raise exception.DBException()