Yevgeny Zaspitsky has uploaded a new change for review. Change subject: engine: Enable subscribing to change display network warnings. ......................................................................
engine: Enable subscribing to change display network warnings. Change-Id: I2b0ac48a6fffc7b0cfa4c971f9e038b2b696c0e6 Bug-Url: https://bugzilla.redhat.com/1078836 Signed-off-by: Yevgeny Zaspitsky <yzasp...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java M frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties A packaging/dbscripts/upgrade/03_05_0350_add_display_network_change_events.sql 4 files changed, 21 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/14/27214/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java index 479dd43..2e1b162 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java @@ -17,6 +17,8 @@ AddEventNotificationEntry(EventNotificationEntity.Engine, AuditLogType.VDC_STOP); // VDS GROUP AddEventNotificationEntry(EventNotificationEntity.VdsGroup, AuditLogType.CLUSTER_ALERT_HA_RESERVATION); + AddEventNotificationEntry(EventNotificationEntity.VdsGroup, + AuditLogType.NETWORK_UPDATE_DISPLAY_FOR_CLUSTER_WITH_ACTIVE_VM); // VDS AddEventNotificationEntry(EventNotificationEntity.Host, AuditLogType.VDS_FAILURE); AddEventNotificationEntry(EventNotificationEntity.Host, AuditLogType.USER_VDS_MAINTENANCE); @@ -37,6 +39,8 @@ AddEventNotificationEntry(EventNotificationEntity.Host, AuditLogType.VDS_LOW_SWAP); AddEventNotificationEntry(EventNotificationEntity.Host, AuditLogType.HOST_INTERFACE_STATE_DOWN); AddEventNotificationEntry(EventNotificationEntity.Host, AuditLogType.HOST_BOND_SLAVE_STATE_DOWN); + AddEventNotificationEntry(EventNotificationEntity.Host, + AuditLogType.NETWORK_UPDATE_DISPLAY_FOR_HOST_WITH_ACTIVE_VM); AddEventNotificationEntry(EventNotificationEntity.VirtHost, AuditLogType.VDS_SET_NONOPERATIONAL_DOMAIN); AddEventNotificationEntry(EventNotificationEntity.VirtHost, AuditLogType.SYSTEM_CHANGE_STORAGE_POOL_STATUS_NO_HOST_FOR_SPM); AddEventNotificationEntry(EventNotificationEntity.VirtHost, AuditLogType.SYSTEM_DEACTIVATED_STORAGE_DOMAIN); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java index a1a8100..8e50cf9 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/LocalizedEnums.java @@ -928,4 +928,9 @@ String KdumpStatus___DISABLED(); String KdumpStatus___ENABLED(); + + String AuditLogType__NETWORK_UPDATE_DISPLAY_FOR_CLUSTER_WITH_ACTIVE_VM(); + + String AuditLogType__NETWORK_UPDATE_DISPLAY_FOR_HOST_WITH_ACTIVE_VM(); + } diff --git a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties index f9d5332..ab6f785 100644 --- a/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties +++ b/frontend/webadmin/modules/uicompat/src/main/resources/org/ovirt/engine/ui/uicompat/LocalizedEnums.properties @@ -461,3 +461,5 @@ KdumpStatus___UNKNOWN=Unknown KdumpStatus___DISABLED=Disabled KdumpStatus___ENABLED=Enabled +AuditLogType__NETWORK_UPDATE_DISPLAY_FOR_CLUSTER_WITH_ACTIVE_VM=Update display network on cluster with an active VM +AuditLogType__NETWORK_UPDATE_DISPLAY_FOR_HOST_WITH_ACTIVE_VM=Update display network on host with an active VM diff --git a/packaging/dbscripts/upgrade/03_05_0350_add_display_network_change_events.sql b/packaging/dbscripts/upgrade/03_05_0350_add_display_network_change_events.sql new file mode 100644 index 0000000..a2203a9 --- /dev/null +++ b/packaging/dbscripts/upgrade/03_05_0350_add_display_network_change_events.sql @@ -0,0 +1,10 @@ +delete from event_map +where event_up_name in ( + 'NETWORK_UPDATE_DISPLAY_FOR_CLUSTER_WITH_ACTIVE_VM', + 'NETWORK_UPDATE_DISPLAY_FOR_HOST_WITH_ACTIVE_VM'); + +insert into event_map(event_up_name, event_down_name) +values('NETWORK_UPDATE_DISPLAY_FOR_CLUSTER_WITH_ACTIVE_VM', 'UNASSIGNED'); + +insert into event_map(event_up_name, event_down_name) +values('NETWORK_UPDATE_DISPLAY_FOR_HOST_WITH_ACTIVE_VM', 'UNASSIGNED'); -- To view, visit http://gerrit.ovirt.org/27214 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2b0ac48a6fffc7b0cfa4c971f9e038b2b696c0e6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yevgeny Zaspitsky <yzasp...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
