Allon Mureinik has uploaded a new change for review. Change subject: core: RemoveDiskParameters - don't use Entity ID ......................................................................
core: RemoveDiskParameters - don't use Entity ID Changed RemoveDiskParameters to stop using Entity ID (which should only be used by Async Tasks related classes) and instead added a diskId member. All current usages were fixed to use the new member. Change-Id: I70dabec5d542c343cbaf71b1a4fdb58b4ec970ff Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskParameters.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java 4 files changed, 21 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/15956/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java index 5493719..43d2f92 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java @@ -164,7 +164,7 @@ */ private List<VM> getVmsForDiskId() { if (listVms == null) { - listVms = getVmDAO().getVmsListForDisk((Guid) getParameters().getEntityId()); + listVms = getVmDAO().getVmsListForDisk((Guid) getParameters().getDiskId()); } return listVms; } @@ -266,7 +266,7 @@ result.setTransactionScopeOption(TransactionScopeOption.Suppress); result.setDiskImage(diskImage); result.setParentCommand(VdcActionType.RemoveDisk); - result.setEntityId(getParameters().getEntityId()); + result.setEntityId(getParameters().getDiskId()); result.setParentParameters(getParameters()); result.setRemoveFromSnapshots(true); result.setStorageDomainId(getParameters().getStorageDomainId()); @@ -329,7 +329,7 @@ @Override protected Map<String, Pair<String, String>> getExclusiveLocks() { - return Collections.singletonMap(getParameters().getEntityId().toString(), + return Collections.singletonMap(getParameters().getDiskId().toString(), LockMessagesMatchUtil.makeLockingPair(LockingGroup.DISK, getDiskIsBeingRemovedLockMessage())); } @@ -368,7 +368,7 @@ protected Disk getDisk() { if (disk == null) { - disk = getDiskDao().get((Guid) getParameters().getEntityId()); + disk = getDiskDao().get(getParameters().getDiskId()); } return disk; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskParameters.java index eac5fb2..bc3747e 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveDiskParameters.java @@ -4,7 +4,8 @@ public class RemoveDiskParameters extends VdcActionParametersBase { - private static final long serialVersionUID = -9133825126638788603L; + private static final long serialVersionUID = -3691440035048144457L; + private Guid diskId; private Guid storageDomainId; private boolean forceDelete; @@ -12,7 +13,7 @@ } public RemoveDiskParameters(Guid diskId) { - setEntityId(diskId); + this.diskId = diskId; } public RemoveDiskParameters(Guid diskId, Guid storageDomainId) { @@ -20,6 +21,14 @@ this.storageDomainId = storageDomainId; } + public Guid getDiskId() { + return diskId; + } + + public void setDiskId(Guid diskId) { + this.diskId = diskId; + } + public void setStorageDomainId(Guid storageId) { this.storageDomainId = storageId; } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java index 274f73d..82ff7ca 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateDisksResourceTest.java @@ -153,7 +153,7 @@ setUpGetEntityExpectations(1); setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk, RemoveDiskParameters.class, - new String[] { "EntityId" }, + new String[] { "DiskId" }, new Object[] { GUIDS[0] }, true, true)); @@ -165,7 +165,7 @@ setUpGetEntityExpectations(1); setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk, RemoveDiskParameters.class, - new String[] { "EntityId" }, + new String[] { "DiskId" }, new Object[] { GUIDS[0] }, true, true)); @@ -180,7 +180,7 @@ setUpGetEntityExpectations(1); setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk, RemoveDiskParameters.class, - new String[] { "EntityId" }, + new String[] { "DiskId" }, new Object[] { GUIDS[0] }, true, true)); @@ -213,7 +213,7 @@ setUpGetEntityExpectations(1); setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk, RemoveDiskParameters.class, - new String[] { "EntityId" }, + new String[] { "DiskId" }, new Object[] { GUIDS[0] }, canDo, success)); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java index 73e511a..895cf91 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java @@ -63,7 +63,7 @@ setUpGetEntityExpectations(); setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk, RemoveDiskParameters.class, - new String[] { "EntityId" }, + new String[] { "DiskId" }, new Object[] { GUIDS[0] }, true, true)); @@ -92,7 +92,7 @@ setUpGetEntityExpectations(); setUriInfo(setUpActionExpectations(VdcActionType.RemoveDisk, RemoveDiskParameters.class, - new String[] { "EntityId" }, + new String[] { "DiskId" }, new Object[] { GUIDS[0] }, canDo, success)); -- To view, visit http://gerrit.ovirt.org/15956 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70dabec5d542c343cbaf71b1a4fdb58b4ec970ff Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
