Sahina Bose has uploaded a new change for review. Change subject: engine,restapi:Enable Gluster Hooks-types & constants defined ......................................................................
engine,restapi:Enable Gluster Hooks-types & constants defined ActionGroup, ObjectType and LogType enum values added for enable gluster hook. Added role action mapping for "Manipulate Gluster Hook" ActionGroup Added enum value for MANIPULATE_GLUSTER_HOOK in PermitType Change-Id: I9bd64caf28ac67c8bba5146d97cd7c17fa4c0899 Signed-off-by: Sahina Bose <[email protected]> --- A backend/manager/dbscripts/upgrade/03_02_0510_add_gluster_hooks_roles.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/EventNotificationEntity.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcEventNotificationUtils.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java M backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java 10 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/13269/1 diff --git a/backend/manager/dbscripts/upgrade/03_02_0510_add_gluster_hooks_roles.sql b/backend/manager/dbscripts/upgrade/03_02_0510_add_gluster_hooks_roles.sql new file mode 100644 index 0000000..11c1e3b --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_02_0510_add_gluster_hooks_roles.sql @@ -0,0 +1,26 @@ +Create or replace FUNCTION __temp_insert_predefined_gluster_hooks_roles() +RETURNS VOID + AS $procedure$ + DECLARE + v_super_user_id_0001 UUID; + v_GLUSTER_ADMIN_ROLE_ID UUID; +BEGIN + v_super_user_id_0001 := '00000000-0000-0000-0000-000000000001'; + v_GLUSTER_ADMIN_ROLE_ID := 'DEF0000b-0000-0000-0000-DEF00000000b'; + +--MANIPULATE_GLUSTER_HOOK +INSERT INTO roles_groups(role_id,action_group_id) SELECT v_super_user_id_0001, 1003 +WHERE not exists (SELECT role_id, action_group_id FROM roles_groups + WHERE role_id=v_super_user_id_0001 and action_group_id=1003); + +-- Map all manipulate gluster hook action groups to the gluster admin role +INSERT INTO roles_groups(role_id,action_group_id) SELECT v_GLUSTER_ADMIN_ROLE_ID, 1003 +WHERE not exists (SELECT role_id, action_group_id FROM roles_groups + WHERE role_id=v_GLUSTER_ADMIN_ROLE_ID and action_group_id=1003); + +RETURN; +END; $procedure$ +LANGUAGE plpgsql; + +select __temp_insert_predefined_gluster_hooks_roles(); +drop function __temp_insert_predefined_gluster_hooks_roles(); 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 9b5b9b3..735278f 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 @@ -237,6 +237,8 @@ GLUSTER_VOLUME_STARTED_FROM_CLI(4039), GLUSTER_VOLUME_STOPPED_FROM_CLI(4040), GLUSTER_VOLUME_OPTION_CHANGED_FROM_CLI(4041), + GLUSTER_HOOK_ENABLE(4042), + GLUSTER_HOOK_ENABLE_FAILED(4043), USER_VDS_RESTART(41), USER_FAILED_VDS_RESTART(107), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/EventNotificationEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/EventNotificationEntity.java index 72d00dc..b09ea4a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/EventNotificationEntity.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/EventNotificationEntity.java @@ -10,8 +10,10 @@ Storage(ApplicationMode.VirtOnly), Engine(ApplicationMode.AllModes), GlusterVolume(ApplicationMode.GlusterOnly), + GlusterHook(ApplicationMode.GlusterOnly), DWH(ApplicationMode.VirtOnly); + private int availableInModes; private EventNotificationEntity(ApplicationMode applicationMode) { 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 f090872..4636211 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 @@ -76,6 +76,8 @@ AddEventNotificationEntry(EventNotificationEntity.GlusterVolume, AuditLogType.GLUSTER_VOLUME_PROFILE_START_FAILED); AddEventNotificationEntry(EventNotificationEntity.GlusterVolume, AuditLogType.GLUSTER_VOLUME_PROFILE_STOP); AddEventNotificationEntry(EventNotificationEntity.GlusterVolume, AuditLogType.GLUSTER_VOLUME_PROFILE_STOP_FAILED); + AddEventNotificationEntry(EventNotificationEntity.GlusterHook, AuditLogType.GLUSTER_HOOK_ENABLE); + AddEventNotificationEntry(EventNotificationEntity.GlusterHook, AuditLogType.GLUSTER_HOOK_ENABLE_FAILED); // DWH AddEventNotificationEntry(EventNotificationEntity.DWH, AuditLogType.DWH_STOPPED); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java index 7144607..e1e9644 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/VdcObjectType.java @@ -29,7 +29,8 @@ Disk(19, "Disk"), Network(20, "Network"), Snapshot(21, "Snapshot"), - Event(22, "Event"); + Event(22, "Event"), + GlusterHook(23, "GlusterHook"); private int value; private String vdcObjectTranslationVal; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java index 04bd8a5..f4ec0f4 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java @@ -238,6 +238,7 @@ StartGlusterVolumeProfile(1410, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), StopGlusterVolumeProfile(1411, ActionGroup.MANIPULATE_GLUSTER_VOLUME, QuotaDependency.NONE), RemoveGlusterServer(1412, ActionGroup.DELETE_HOST, QuotaDependency.NONE), + EnableGlusterHook(1413, ActionGroup.MANIPULATE_GLUSTER_HOOK, QuotaDependency.NONE), // External events AddExternalEvent(1500, ActionGroup.INJECT_EXTERNAL_EVENTS, QuotaDependency.NONE), diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java index 43eceaf..c2ecf8d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionGroup.java @@ -88,6 +88,7 @@ CREATE_GLUSTER_VOLUME(1000, RoleType.ADMIN, VdcObjectType.GlusterVolume, true, ApplicationMode.GlusterOnly), MANIPULATE_GLUSTER_VOLUME(1001, RoleType.ADMIN, VdcObjectType.GlusterVolume, true, ApplicationMode.GlusterOnly), DELETE_GLUSTER_VOLUME(1002, RoleType.ADMIN, VdcObjectType.GlusterVolume, true, ApplicationMode.GlusterOnly), + MANIPULATE_GLUSTER_HOOK(1003, RoleType.ADMIN, VdcObjectType.GlusterHook, true, ApplicationMode.GlusterOnly), // Disks action groups CREATE_DISK(1100, RoleType.USER, VdcObjectType.Disk, false, ApplicationMode.VirtOnly), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java index 8743616..5adb124 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java @@ -102,6 +102,8 @@ severities.put(AuditLogType.GLUSTER_SERVER_REMOVED_FROM_CLI, AuditLogSeverity.WARNING); severities.put(AuditLogType.GLUSTER_VOLUME_STARTED_FROM_CLI, AuditLogSeverity.WARNING); severities.put(AuditLogType.GLUSTER_VOLUME_STOPPED_FROM_CLI, AuditLogSeverity.WARNING); + severities.put(AuditLogType.GLUSTER_HOOK_ENABLE, AuditLogSeverity.NORMAL); + severities.put(AuditLogType.GLUSTER_HOOK_ENABLE_FAILED, AuditLogSeverity.ERROR); } private static void initDefaultSeverities() { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java index 472913a..360098a 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java +++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/PermitType.java @@ -83,6 +83,7 @@ CREATE_GLUSTER_VOLUME, MANIPULATE_GLUSTER_VOLUME, DELETE_GLUSTER_VOLUME, + MANIPULATE_GLUSTER_HOOK, // Disks action groups CREATE_DISK, diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java index d59c6d2..5a16000 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/PermitMapper.java @@ -144,6 +144,8 @@ return PermitType.MANIPULATE_GLUSTER_VOLUME; case DELETE_GLUSTER_VOLUME: return PermitType.DELETE_GLUSTER_VOLUME; + case MANIPULATE_GLUSTER_HOOK: + return PermitType.MANIPULATE_GLUSTER_HOOK; case CREATE_DISK: return PermitType.CREATE_DISK; case ATTACH_DISK: -- To view, visit http://gerrit.ovirt.org/13269 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9bd64caf28ac67c8bba5146d97cd7c17fa4c0899 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
