Martin Mucha has uploaded a new change for review. Change subject: core: method 'addPermission' moved from NetworkHelper to MultiLevelAdministrationHandler ......................................................................
core: method 'addPermission' moved from NetworkHelper to MultiLevelAdministrationHandler Change-Id: I8b409f6c91eed38c5d909cee9ef18f543a8e35d5 Signed-off-by: Martin Mucha <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java 3 files changed, 17 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/29895/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java index 9c0f9d7..cb53338e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.action.MacPoolParameters; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.MacPool; -import org.ovirt.engine.core.common.businessentities.Permissions; import org.ovirt.engine.core.common.errors.VdcBllMessages; import org.ovirt.engine.core.compat.Guid; @@ -84,16 +83,6 @@ } private void addPermission(Guid userId, Guid macPoolId) { - addPermission(userId, macPoolId, PredefinedRoles.MAC_POOL_ADMIN, VdcObjectType.MacPool); + MultiLevelAdministrationHandler.addPermission(userId, macPoolId, PredefinedRoles.MAC_POOL_ADMIN, VdcObjectType.MacPool); } - - private static void addPermission(Guid userId, Guid entityId, PredefinedRoles role, VdcObjectType objectType) { - Permissions perms = new Permissions(); - perms.setad_element_id(userId); - perms.setObjectType(objectType); - perms.setObjectId(entityId); - perms.setrole_id(role.getId()); - MultiLevelAdministrationHandler.addPermission(perms); - } - } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java index 965813f..b0bf3b7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java @@ -3,6 +3,7 @@ import java.util.List; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.businessentities.DbUser; import org.ovirt.engine.core.common.businessentities.Permissions; import org.ovirt.engine.core.common.businessentities.RoleType; @@ -137,4 +138,13 @@ public static boolean isMultilevelAdministrationOn() { return Config.<Boolean> getValue(ConfigValues.IsMultilevelAdministrationOn); } + + public static void addPermission(Guid userId, Guid entityId, PredefinedRoles role, VdcObjectType objectType) { + Permissions perms = new Permissions(); + perms.setad_element_id(userId); + perms.setObjectType(objectType); + perms.setObjectId(entityId); + perms.setrole_id(role.getId()); + addPermission(perms); + } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java index 1d38506..b9b842f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java @@ -7,7 +7,6 @@ import org.ovirt.engine.core.bll.utils.VersionSupport; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.VdcActionType; -import org.ovirt.engine.core.common.businessentities.Permissions; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VnicProfile; import org.ovirt.engine.core.compat.Guid; @@ -28,7 +27,7 @@ * the Network ID */ public static void addPermissionsOnNetwork(Guid userId, Guid networkId) { - addPermission(userId, networkId, PredefinedRoles.NETWORK_ADMIN, VdcObjectType.Network); + MultiLevelAdministrationHandler.addPermission(userId, networkId, PredefinedRoles.NETWORK_ADMIN, VdcObjectType.Network); } /** @@ -43,11 +42,14 @@ * Indicates of the network is intended for a public user */ public static void addPermissionsOnVnicProfile(Guid userId, Guid vnicProfileId, boolean publicUse) { - addPermission(userId, vnicProfileId, PredefinedRoles.NETWORK_ADMIN, VdcObjectType.VnicProfile); + MultiLevelAdministrationHandler.addPermission(userId, + vnicProfileId, + PredefinedRoles.NETWORK_ADMIN, + VdcObjectType.VnicProfile); // if the profile is for public use, set EVERYONE as a VNICProfileUser on the profile if (publicUse) { - addPermission(MultiLevelAdministrationHandler.EVERYONE_OBJECT_ID, + MultiLevelAdministrationHandler.addPermission(MultiLevelAdministrationHandler.EVERYONE_OBJECT_ID, vnicProfileId, PredefinedRoles.VNIC_PROFILE_USER, VdcObjectType.VnicProfile); @@ -61,15 +63,6 @@ profile.setNetworkId(net.getId()); profile.setPortMirroring(false); return profile; - } - - private static void addPermission(Guid userId, Guid entityId, PredefinedRoles role, VdcObjectType objectType) { - Permissions perms = new Permissions(); - perms.setad_element_id(userId); - perms.setObjectType(objectType); - perms.setObjectId(entityId); - perms.setrole_id(role.getId()); - MultiLevelAdministrationHandler.addPermission(perms); } public static Network getNetworkByVnicProfileId(Guid vnicProfileId) { -- To view, visit http://gerrit.ovirt.org/29895 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b409f6c91eed38c5d909cee9ef18f543a8e35d5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Mucha <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
