Moti Asayag has uploaded a new change for review. Change subject: engine: Permissions for vnic profiles created on network ......................................................................
engine: Permissions for vnic profiles created on network The permissions for the vnic profiles should be created directly on the vnic profile entity and not on the network entity to which the vnic profile belongs. Change-Id: Ic0d2bbc3455bf4959eb7fedc18acd181c56c29f8 Bug-Url: https://bugzilla.redhat.com/1003787 Signed-off-by: Moti Asayag <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/NetworkHelper.java 1 file changed, 6 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/18826/1 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 9f3ffd4..2864a96 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 @@ -25,7 +25,7 @@ * the Network ID */ public static void addPermissionsOnNetwork(Guid userId, Guid networkId) { - addPermission(userId, networkId, PredefinedRoles.NETWORK_ADMIN); + addPermission(userId, networkId, PredefinedRoles.NETWORK_ADMIN, VdcObjectType.Network); } /** @@ -40,13 +40,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); + 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, vnicProfileId, - PredefinedRoles.VNIC_PROFILE_USER); + PredefinedRoles.VNIC_PROFILE_USER, + VdcObjectType.VnicProfile); } } @@ -59,10 +60,10 @@ return profile; } - private static void addPermission(Guid userId, Guid entityId, PredefinedRoles role) { + private static void addPermission(Guid userId, Guid entityId, PredefinedRoles role, VdcObjectType objectType) { permissions perms = new permissions(); perms.setad_element_id(userId); - perms.setObjectType(VdcObjectType.Network); + perms.setObjectType(objectType); perms.setObjectId(entityId); perms.setrole_id(role.getId()); MultiLevelAdministrationHandler.addPermission(perms); -- To view, visit http://gerrit.ovirt.org/18826 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0d2bbc3455bf4959eb7fedc18acd181c56c29f8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
