Daniel Erez has uploaded a new change for review. Change subject: core: LiveMigrateVmDisksCommand - disk id for perm subject ......................................................................
core: LiveMigrateVmDisksCommand - disk id for perm subject Passing diskId instead of imageId for permission subject (as done in I87d7733174b7b5af805f53834c64e032aafbe94b). Change-Id: If10daec3924e99fb728ae65da0f5fbede07aed85 Bug-Url: https://bugzilla.redhat.com/1071687 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/27169/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java index e002625..97a95a5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateVmDisksCommand.java @@ -139,9 +139,12 @@ List<PermissionSubject> permissionList = new ArrayList<PermissionSubject>(); for (LiveMigrateDiskParameters parameters : getParameters().getParametersList()) { - permissionList.add(new PermissionSubject(parameters.getImageId(), - VdcObjectType.Disk, - ActionGroup.CONFIGURE_DISK_STORAGE)); + DiskImage diskImage = getDiskImageDao().get(parameters.getImageId()); + if (diskImage != null) { + permissionList.add(new PermissionSubject(diskImage.getId(), + VdcObjectType.Disk, + ActionGroup.CONFIGURE_DISK_STORAGE)); + } permissionList.add(new PermissionSubject(parameters.getStorageDomainId(), VdcObjectType.Storage, ActionGroup.CREATE_DISK)); -- To view, visit http://gerrit.ovirt.org/27169 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If10daec3924e99fb728ae65da0f5fbede07aed85 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
