Eli Mesika has submitted this change and it was merged. Change subject: tools: notifier: Required changes in events data mapping. ...................................................................... tools: notifier: Required changes in events data mapping. The event_audit_log_subscriber_view contains info about users and events. Since we will need to provide subscribers from other sources (snmp subscribers will come from the configuration) we must query the two separately. As a result of this: event_audit_log_subscriber_view is dropped, EventAuditLogSubscriber the entity that represented it is deleted, and new entities were defined: AuditLogEvent and AuditLogEventSubscriber AuditLogEventType is no longer an inner class and a new interface, EventFilter, represents the matching between events and subscribers. More implementations of this enum will follow. Mail senders and tests updated to use the new entities. Change-Id: I3350d1c1caa6d730a3c7916ee0581f1aaa4a582a Signed-off-by: Mooli Tayer <mtayer(a)redhat.com&gt; --- A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLogEvent.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLogEventSubscriber.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLogEventType.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventAuditLogSubscriber.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EventFilter.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/UpDownEventFilter.java A backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationMethodsMapper.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java M backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationServiceException.java A backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/dao/EventsManager.java R backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/EventSenderResult.java A backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/Transport.java A backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/EventMessageContent.java R backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/JavaMailSender.java R backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/MessageBody.java R backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/MessageHelper.java R backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/NotificationMethodsMapper.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/EventSender.java D backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/sender/mail/EventMessageContent.java M packaging/dbscripts/create_views.sql 21 files changed, 802 insertions(+), 688 deletions(-) Approvals: Eli Mesika: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/23107 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3350d1c1caa6d730a3c7916ee0581f1aaa4a582a Gerrit-PatchSet: 23 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: mooli tayer <mtayer(a)redhat.com&gt; Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com&gt; Gerrit-Reviewer: Eli Mesika <emesika(a)redhat.com&gt; Gerrit-Reviewer: Martin Peřina <mperina(a)redhat.com&gt; Gerrit-Reviewer: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: mooli tayer <mtayer(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server