openstack
/
tacker
Code Issues Proposed changes

Merge "FIX: nfv event list failed with internal server error"

This commit is contained in:
Zuul 2019-07-03 01:23:06 +00:00 committed by Gerrit Code Review
parent 957aed4965 ecd78c6048
commit e0f905ff05
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tacker/db/common_services/common_services_db_plugin.py
View File

@ -16,6 +16,7 @@
from sqlalchemy.orm import exc as orm_exc
from oslo_db import exception
from oslo_log import log as logging
from tacker.common import log
@ -82,7 +83,12 @@ class CommonServicesPluginDb(common_services.CommonServicesPluginBase,
@log.log
def get_events(self, context, filters=None, fields=None, sorts=None,
limit=None, marker_obj=None, page_reverse=False):
return self._get_collection(context, common_services_db.Event,
self._make_event_dict,
filters, fields, sorts, limit,
marker_obj, page_reverse)
try:
return self._get_collection(context, common_services_db.Event,
self._make_event_dict,
filters, fields, sorts, limit,
marker_obj, page_reverse)
except exception.DBError as e:
LOG.error("Failed to get event: %s", e.message)
msg = "Id should be in UUID v4 format"
raise common_services.InvalidFormat(error=msg)

4
tacker/extensions/common_services.py
View File

@ -46,6 +46,10 @@ class ParamYAMLInputMissing(exceptions.InvalidInput):
message = _("Parameter YAML input missing")
class InvalidFormat(exceptions.InvalidInput):
message = _("Invalid format. '%(error)s'")
RESOURCE_ATTRIBUTE_MAP = {
'events': {