Maor Lipchuk has uploaded a new change for review. Change subject: core: Rename CindeBroker method ......................................................................
core: Rename CindeBroker method Rename Cinder broker method to make it more clear Change-Id: I0bc64e0f850f202ccd3c67decfcb6cc02312ce1b Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CinderBroker.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveCinderDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommand.java 3 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/42482/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CinderBroker.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CinderBroker.java index d8ea485..f09ae0c 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CinderBroker.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/CinderBroker.java @@ -85,7 +85,7 @@ }); } - public VolumeClassification deleteVolumeUnknownType(CinderDisk cinderDisk) { + public VolumeClassification deleteVolumeByClassificationType(CinderDisk cinderDisk) { VolumeClassification cinderVolumeType = cinderDisk.getVolumeClassification(); if (cinderVolumeType == VolumeClassification.Volume) { deleteVolume(cinderDisk); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveCinderDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveCinderDiskCommand.java index e38a046..cd243d7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveCinderDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveCinderDiskCommand.java @@ -62,7 +62,7 @@ lockVmSnapshotsWithWait(vm); } } - getCinderBroker().deleteVolumeUnknownType(lastCinderVolume); + getCinderBroker().deleteVolumeByClassificationType(lastCinderVolume); getParameters().setRemovedVolume(lastCinderVolume); persistCommand(getParameters().getParentCommand(), true); getReturnValue().setActionReturnValue(disk.getId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommand.java index b2a9b9b..f29ef49 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RestoreFromCinderSnapshotCommand.java @@ -70,7 +70,7 @@ getParameters().setDestinationImageId(cinderSnapshot.getImageId()); getParameters().setCinderDiskToBeRemoved(cinderSnapshot); getParameters().setRemoveParent(false); - getCinderBroker().deleteVolumeUnknownType(cinderSnapshot); + getCinderBroker().deleteVolumeByClassificationType(cinderSnapshot); } private void removeDecendedSnapshots(CinderDisk cinderSnapshot, DiskImage descendantSnapshot) { @@ -81,7 +81,7 @@ if (lastParentToRemove != null) { getParameters().setCinderDiskToBeRemoved(lastParentToRemove); getParameters().setDestinationImageId(lastParentToRemove.getImageId()); - getCinderBroker().deleteVolumeUnknownType(lastParentToRemove); + getCinderBroker().deleteVolumeByClassificationType(lastParentToRemove); if (!cinderSnapshot.getImageId().equals(lastParentToRemove.getImageId())) { getParameters().setRemoveParent(true); } -- To view, visit https://gerrit.ovirt.org/42482 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0bc64e0f850f202ccd3c67decfcb6cc02312ce1b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
