diff --git a/nova/api/openstack/compute/legacy_v2/contrib/server_external_events.py b/nova/api/openstack/compute/legacy_v2/contrib/server_external_events.py index fcc42b9c8275..7a015759e94d 100644 --- a/nova/api/openstack/compute/legacy_v2/contrib/server_external_events.py +++ b/nova/api/openstack/compute/legacy_v2/contrib/server_external_events.py @@ -83,7 +83,8 @@ class ServerExternalEventsController(wsgi.Controller): except exception.InstanceNotFound: LOG.debug('Dropping event %(name)s:%(tag)s for unknown ' 'instance %(instance_uuid)s', - dict(event)) + {'name': event.name, 'tag': event.tag, + 'instance_uuid': event.instance_uuid}) _event['status'] = 'failed' _event['code'] = 404 result = 207 @@ -97,7 +98,8 @@ class ServerExternalEventsController(wsgi.Controller): accepted_instances.add(instance) LOG.info(_LI('Creating event %(name)s:%(tag)s for ' 'instance %(instance_uuid)s'), - dict(event)) + {'name': event.name, 'tag': event.tag, + 'instance_uuid': event.instance_uuid}) # NOTE: as the event is processed asynchronously verify # whether 202 is a more suitable response code than 200 _event['status'] = 'completed' diff --git a/nova/api/openstack/compute/server_external_events.py b/nova/api/openstack/compute/server_external_events.py index 3ec77ad1546d..6a6b3592da15 100644 --- a/nova/api/openstack/compute/server_external_events.py +++ b/nova/api/openstack/compute/server_external_events.py @@ -71,7 +71,8 @@ class ServerExternalEventsController(wsgi.Controller): except exception.InstanceNotFound: LOG.debug('Dropping event %(name)s:%(tag)s for unknown ' 'instance %(instance_uuid)s', - dict(event)) + {'name': event.name, 'tag': event.tag, + 'instance_uuid': event.instance_uuid}) _event['status'] = 'failed' _event['code'] = 404 result = 207 @@ -85,7 +86,8 @@ class ServerExternalEventsController(wsgi.Controller): accepted_instances.add(instance) LOG.info(_LI('Creating event %(name)s:%(tag)s for ' 'instance %(instance_uuid)s'), - dict(event)) + {'name': event.name, 'tag': event.tag, + 'instance_uuid': event.instance_uuid}) # NOTE: as the event is processed asynchronously verify # whether 202 is a more suitable response code than 200 _event['status'] = 'completed' diff --git a/nova/objects/external_event.py b/nova/objects/external_event.py index beea55d4ba13..f31c4dafe9f9 100644 --- a/nova/objects/external_event.py +++ b/nova/objects/external_event.py @@ -29,10 +29,8 @@ EVENT_NAMES = [ EVENT_STATUSES = ['failed', 'completed', 'in-progress'] -# TODO(berrange): Remove NovaObjectDictCompat @obj_base.NovaObjectRegistry.register -class InstanceExternalEvent(obj_base.NovaObject, - obj_base.NovaObjectDictCompat): +class InstanceExternalEvent(obj_base.NovaObject): # Version 1.0: Initial version # Supports network-changed and vif-plugged # Version 1.1: adds network-vif-deleted event