Daniel Erez has uploaded a new change for review. Change subject: core: AddDiskCommand - extract addManagedDevice to a method ......................................................................
core: AddDiskCommand - extract addManagedDevice to a method Extract VmDeviceUtils.addManagedDevice to a method in AddDiskCommand/AddCinderDiskCommand. Change-Id: I6e8f4eaeddc4bec08a5dd509054d357f03670445 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Daniel Erez <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddCinderDiskCommand.java 2 files changed, 14 insertions(+), 23 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/39063/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java index 108cb7a..9894140 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddDiskCommand.java @@ -39,6 +39,7 @@ import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.common.businessentities.VMStatus; +import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmDeviceGeneralType; import org.ovirt.engine.core.common.businessentities.VmDeviceId; import org.ovirt.engine.core.common.businessentities.storage.CinderDisk; @@ -408,13 +409,7 @@ getBaseDiskDao().save(getParameters().getDiskInfo()); getDiskLunMapDao().save(new DiskLunMap(getParameters().getDiskInfo().getId(), lun.getLUN_id())); if (getVm() != null) { - VmDeviceUtils.addManagedDevice(new VmDeviceId(getParameters().getDiskInfo().getId(), getVmId()), - VmDeviceGeneralType.DISK, - VmDeviceType.DISK, - null, - shouldDiskBePlugged(), - Boolean.TRUE.equals(getParameters().getDiskInfo().getReadOnly()), - null); + addManagedDeviceForDisk(); } return null; } @@ -422,6 +417,16 @@ getReturnValue().setActionReturnValue(getParameters().getDiskInfo().getId()); plugDiskToVmIfNeeded(); setSucceeded(true); + } + + protected VmDevice addManagedDeviceForDisk() { + return VmDeviceUtils.addManagedDevice(new VmDeviceId(getParameters().getDiskInfo().getId(), getVmId()), + VmDeviceGeneralType.DISK, + VmDeviceType.DISK, + null, + shouldDiskBePlugged(), + Boolean.TRUE.equals(getParameters().getDiskInfo().getReadOnly()), + null); } protected boolean shouldDiskBePlugged() { @@ -466,15 +471,7 @@ taskList.addAll(tmpRetValue.getInternalVdsmTaskIdList()); if (getVm() != null) { - getCompensationContext().snapshotNewEntity(VmDeviceUtils.addManagedDevice(new VmDeviceId(getParameters().getDiskInfo() - .getId(), - getVmId()), - VmDeviceGeneralType.DISK, - VmDeviceType.DISK, - null, - shouldDiskBePlugged(), - Boolean.TRUE.equals(getParameters().getDiskInfo().getReadOnly()), - null)); + getCompensationContext().snapshotNewEntity(addManagedDeviceForDisk()); getCompensationContext().stateChanged(); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddCinderDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddCinderDiskCommand.java index 3ed2374..6b87c8f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddCinderDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddCinderDiskCommand.java @@ -67,13 +67,7 @@ getDiskImageDynamicDao().save(diskDynamic); if (getVm() != null) { - VmDeviceUtils.addManagedDevice(new VmDeviceId(cinderDisk.getId(), getVmId()), - VmDeviceGeneralType.DISK, - VmDeviceType.DISK, - null, - shouldDiskBePlugged(), - Boolean.TRUE.equals(cinderDisk.getReadOnly()), - null); + addManagedDeviceForDisk(); } return null; } -- To view, visit https://gerrit.ovirt.org/39063 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e8f4eaeddc4bec08a5dd509054d357f03670445 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
