Tal Nisan has uploaded a new change for review.
Change subject: core: Change duplicate audit log values to unique ones
......................................................................
core: Change duplicate audit log values to unique ones
Since the audit log value is supposed to be unique, a test
will be added to enforce uniqueness of the audit log values
prior to that, since we have duplicate values in the AuditLogType
class we have to change first the duplicate values to different values
to ensure uniqueness
Change-Id: Ife969c6a094ba8acf4b7b1544be017d8a034485f
Signed-off-by: Tal Nisan <tni...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
1 file changed, 34 insertions(+), 34 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/29740/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
index 4ef53e5..ed1b353 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
@@ -23,9 +23,9 @@
AuditLogTimeInterval.MINUTE.getValue()), // When VDS is reactivated
VDS_RECOVER_FAILED(19, AuditLogSeverity.ERROR,
AuditLogTimeInterval.MINUTE.getValue()), // When VDS changes
status down->up
- VDS_STATUS_CHANGE_FAILED_DUE_TO_STOP_SPM_FAILURE(20,
AuditLogSeverity.WARNING,
+ VDS_STATUS_CHANGE_FAILED_DUE_TO_STOP_SPM_FAILURE(27,
AuditLogSeverity.WARNING,
AuditLogTimeInterval.MINUTE.getValue()),
- VDS_PROVISION(21, AuditLogSeverity.WARNING,
AuditLogTimeInterval.MINUTE.getValue()),
+ VDS_PROVISION(28, AuditLogSeverity.WARNING,
AuditLogTimeInterval.MINUTE.getValue()),
VDS_SLOW_STORAGE_RESPONSE_TIME(123, AuditLogSeverity.WARNING,
AuditLogTimeInterval.MINUTE.getValue() * 5), // ?
VDS_ALREADY_IN_REQUESTED_STATUS(493, AuditLogSeverity.WARNING),
@@ -69,11 +69,11 @@
AuditLogTimeInterval.SECOND.getValue() * 30),
VDS_CPU_LOWER_THAN_CLUSTER(515, AuditLogSeverity.WARNING),
VDS_CPU_RETRIEVE_FAILED(516, AuditLogSeverity.WARNING),
- VDS_FAILED_TO_GET_HOST_HARDWARE_INFO(517, AuditLogSeverity.WARNING),
+ VDS_FAILED_TO_GET_HOST_HARDWARE_INFO(90, AuditLogSeverity.WARNING),
@Deprecated
- VDS_STORAGE_CONNECTION_FAILED_BUT_LAST_VDS(533, AuditLogSeverity.ERROR),
- VDS_STORAGES_CONNECTION_FAILED(535, AuditLogSeverity.ERROR),
- VDS_STORAGE_VDS_STATS_FAILED(534, AuditLogSeverity.ERROR),
+ VDS_STORAGE_CONNECTION_FAILED_BUT_LAST_VDS(187, AuditLogSeverity.ERROR),
+ VDS_STORAGES_CONNECTION_FAILED(188, AuditLogSeverity.ERROR),
+ VDS_STORAGE_VDS_STATS_FAILED(189, AuditLogSeverity.ERROR),
VDS_SET_NONOPERATIONAL(517, AuditLogTimeInterval.MINUTE.getValue()),
VDS_SET_NONOPERATIONAL_FAILED(518, AuditLogSeverity.ERROR,
AuditLogTimeInterval.MINUTE.getValue()),
@@ -150,7 +150,7 @@
USER_VDC_LOGOUT_FAILED(815, AuditLogSeverity.ERROR), // User logged out
failed
USER_INITIATED_RUN_VM(150),
- USER_INITIATED_RUN_VM_AND_PAUSE(156),
+ USER_INITIATED_RUN_VM_AND_PAUSE(179),
USER_STARTED_VM(153),
USER_INITIATED_RUN_VM_FAILED(151, AuditLogSeverity.WARNING),
USER_RUN_VM(32), // User issued runVm command
@@ -190,7 +190,7 @@
@Deprecated
USER_SUSPEND_VM_FINISH_SUCCESS(512),
USER_SUSPEND_VM_FINISH_FAILURE(521, AuditLogSeverity.ERROR),
- USER_SUSPEND_VM_FINISH_FAILURE_WILL_TRY_AGAIN(532, AuditLogSeverity.ERROR),
+ USER_SUSPEND_VM_FINISH_FAILURE_WILL_TRY_AGAIN(130, AuditLogSeverity.ERROR),
USER_FAILED_SUSPEND_VM(502, AuditLogSeverity.ERROR),
USER_SUSPEND_VM_OK(503),
USER_RESUME_VM(40),
@@ -367,7 +367,7 @@
GLUSTER_BRICK_STATUS_CHANGED(4086, AuditLogSeverity.WARNING),
GLUSTER_VOLUME_REBALANCE_FINISHED(4087),
GLUSTER_VOLUME_MIGRATE_BRICK_DATA_FINISHED(4088),
- GLUSTER_HOST_UUID_ALREADY_EXISTS(4089, AuditLogSeverity.ERROR),
+ GLUSTER_HOST_UUID_ALREADY_EXISTS(4095, AuditLogSeverity.ERROR),
GLUSTER_VOLUME_REBALANCE_START_DETECTED_FROM_CLI(4089),
START_REMOVING_GLUSTER_VOLUME_BRICKS_DETECTED_FROM_CLI(4090),
GLUSTER_VOLUME_REBALANCE_NOT_FOUND_FROM_CLI(4091,
AuditLogSeverity.WARNING),
@@ -409,8 +409,8 @@
USER_RESTORE_FROM_SNAPSHOT_FINISH_FAILURE(101, AuditLogSeverity.ERROR),
USER_FAILED_RESTORE_FROM_SNAPSHOT(116, AuditLogSeverity.ERROR),
USER_ADD_VM_TEMPLATE(48),
- USER_ADD_VM_TEMPLATE_SUCCESS(53),
- USER_ADD_VM_TEMPLATE_FAILURE(54, AuditLogSeverity.ERROR),
+ USER_ADD_VM_TEMPLATE_SUCCESS(29),
+ USER_ADD_VM_TEMPLATE_FAILURE(36, AuditLogSeverity.ERROR),
USER_ADD_VM_TEMPLATE_FINISHED_SUCCESS(51),
USER_ADD_VM_TEMPLATE_FINISHED_FAILURE(52, AuditLogSeverity.ERROR),
USER_FAILED_ADD_VM_TEMPLATE(108, AuditLogSeverity.ERROR),
@@ -488,16 +488,16 @@
VM_PAUSED_EIO(145, AuditLogSeverity.ERROR),
VM_PAUSED_EPERM(146, AuditLogSeverity.ERROR),
VM_POWER_DOWN_FAILED(147, AuditLogSeverity.WARNING),
- VM_IMPORT_FROM_CONFIGURATION_EXECUTED_SUCCESSFULLY(148),
- VM_IMPORT_FROM_CONFIGURATION_ATTACH_DISKS_FAILED(149,
AuditLogSeverity.WARNING),
+ VM_IMPORT_FROM_CONFIGURATION_EXECUTED_SUCCESSFULLY(174),
+ VM_IMPORT_FROM_CONFIGURATION_ATTACH_DISKS_FAILED(175,
AuditLogSeverity.WARNING),
VM_MEMORY_UNDER_GUARANTEED_VALUE(148, AuditLogSeverity.ERROR,
AuditLogTimeInterval.MINUTE.getValue() * 15),
- VM_BALLOON_DRIVER_ERROR(149, AuditLogSeverity.ERROR,
+ VM_BALLOON_DRIVER_ERROR(176, AuditLogSeverity.ERROR,
AuditLogTimeInterval.MINUTE.getValue() * 15),
- VM_BALLOON_DRIVER_UNCONTROLLED(150, AuditLogSeverity.ERROR,
+ VM_BALLOON_DRIVER_UNCONTROLLED(177, AuditLogSeverity.ERROR,
AuditLogTimeInterval.MINUTE.getValue() * 15),
- VM_MEMORY_NOT_IN_RECOMMENDED_RANGE(151, AuditLogSeverity.WARNING),
+ VM_MEMORY_NOT_IN_RECOMMENDED_RANGE(178, AuditLogSeverity.WARNING),
USER_ADD_VM_POOL(300),
USER_ADD_VM_POOL_FAILED(301, AuditLogSeverity.ERROR),
@@ -573,10 +573,10 @@
USER_ATTACH_TAG_TO_USER_GROUP_EXISTS(453, AuditLogSeverity.WARNING),
USER_ATTACH_TAG_TO_VM_EXISTS(454, AuditLogSeverity.WARNING),
USER_ATTACH_TAG_TO_VDS_EXISTS(455, AuditLogSeverity.WARNING),
- USER_ATTACH_TAG_TO_TEMPLATE(456),
- USER_ATTACH_TAG_TO_TEMPLATE_FAILED(457, AuditLogSeverity.ERROR),
- USER_DETACH_TEMPLATE_FROM_TAG(458),
- USER_DETACH_TEMPLATE_FROM_TAG_FAILED(459, AuditLogSeverity.ERROR),
+ USER_ATTACH_TAG_TO_TEMPLATE(183),
+ USER_ATTACH_TAG_TO_TEMPLATE_FAILED(184, AuditLogSeverity.ERROR),
+ USER_DETACH_TEMPLATE_FROM_TAG(185),
+ USER_DETACH_TEMPLATE_FROM_TAG_FAILED(186, AuditLogSeverity.ERROR),
USER_ATTACH_TAG_TO_TEMPLATE_EXISTS(460, AuditLogSeverity.WARNING),
USER_MOVE_TAG(555),
USER_MOVE_TAG_FAILED(556, AuditLogSeverity.ERROR),
@@ -724,7 +724,7 @@
IMPORTEXPORT_STARTING_REMOVE_VM(1167),
IMPORTEXPORT_REMOVE_VM(1160),
IMPORTEXPORT_REMOVE_VM_FAILED(1161, AuditLogSeverity.ERROR),
- IMPORTEXPORT_GET_VMS_INFO_FAILED(1162, AuditLogSeverity.ERROR,
+ IMPORTEXPORT_GET_VMS_INFO_FAILED(200, AuditLogSeverity.ERROR,
AuditLogTimeInterval.MINUTE.getValue() * 30),
IMPORTEXPORT_FAILED_TO_IMPORT_VM(1168, AuditLogSeverity.WARNING),
IMPORTEXPORT_FAILED_TO_IMPORT_TEMPLATE(1169, AuditLogSeverity.WARNING),
@@ -842,15 +842,15 @@
RELOAD_CONFIGURATIONS_SUCCESS(1010),
RELOAD_CONFIGURATIONS_FAILURE(1011, AuditLogSeverity.ERROR),
- UPDATE_OVF_FOR_STORAGE_DOMAIN_FAILED(1012),
- CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED(1013),
- CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_INITIATE_FAILED(1014),
- DELETE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED(1015),
+ UPDATE_OVF_FOR_STORAGE_DOMAIN_FAILED(190),
+ CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED(191),
+ CREATE_OVF_STORE_FOR_STORAGE_DOMAIN_INITIATE_FAILED(192),
+ DELETE_OVF_STORE_FOR_STORAGE_DOMAIN_FAILED(193),
UPDATE_DESCRIPTION_FOR_OVF_STORE_FAILED(1016),
RETRIEVE_OVF_STORE_FAILED(1017, AuditLogSeverity.WARNING),
// Authentication
- USER_ACCOUNT_DISABLED_OR_LOCKED(1100, AuditLogSeverity.ERROR,
+ USER_ACCOUNT_DISABLED_OR_LOCKED(160, AuditLogSeverity.ERROR,
AuditLogTimeInterval.HOUR.getValue()),
USER_ACCOUNT_PASSWORD_EXPIRED(1171, AuditLogSeverity.ERROR,
AuditLogTimeInterval.HOUR.getValue()),
@@ -874,14 +874,14 @@
AUTH_FAILED_INTERNAL_KERBEROS_ERROR(1184, AuditLogSeverity.ERROR),
// Providers
- PROVIDER_ADDED(1150),
- PROVIDER_ADDITION_FAILED(1151, AuditLogSeverity.ERROR),
- PROVIDER_UPDATED(1152),
- PROVIDER_UPDATE_FAILED(1153, AuditLogSeverity.ERROR),
- PROVIDER_REMOVED(1154),
- PROVIDER_REMOVAL_FAILED(1155, AuditLogSeverity.ERROR),
- PROVIDER_CERTIFICATE_CHAIN_IMPORTED(1156),
- PROVIDER_CERTIFICATE_CHAIN_IMPORT_FAILED(1157, AuditLogSeverity.ERROR),
+ PROVIDER_ADDED(205),
+ PROVIDER_ADDITION_FAILED(206, AuditLogSeverity.ERROR),
+ PROVIDER_UPDATED(207),
+ PROVIDER_UPDATE_FAILED(208, AuditLogSeverity.ERROR),
+ PROVIDER_REMOVED(209),
+ PROVIDER_REMOVAL_FAILED(210, AuditLogSeverity.ERROR),
+ PROVIDER_CERTIFICATE_CHAIN_IMPORTED(211),
+ PROVIDER_CERTIFICATE_CHAIN_IMPORT_FAILED(212, AuditLogSeverity.ERROR),
// General
ENTITY_RENAMED(1200),
--
To view, visit http://gerrit.ovirt.org/29740
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife969c6a094ba8acf4b7b1544be017d8a034485f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tal Nisan <tni...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
