Ravi Nori has uploaded a new change for review. Change subject: engine : Fix variable names in VdcReturnValueBase ......................................................................
engine : Fix variable names in VdcReturnValueBase Fix variable names and the the correspoding set and get method names in VdcReturnValueBase Change-Id: Iebfbd19f8eeef4a9a0d30eadaacb1d833cae0ec7 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java 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/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase_CustomFieldSerializer.java 46 files changed, 98 insertions(+), 98 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/14909/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java index 2c0fc93..66bebfe 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractSPMAsyncTaskHandler.java @@ -60,7 +60,7 @@ private void addTask(Guid taskId, VDSReturnValue vdsReturnValue, boolean isRevertedTask) { AsyncTaskCreationInfo taskCreationInfo = vdsReturnValue.getCreationInfo(); - getReturnValue().getInternalTaskIdList().add(cmd.createTask( + getReturnValue().getInternalVdsmTaskIdList().add(cmd.createTask( taskId, taskCreationInfo, cmd.getActionType(), @@ -68,7 +68,7 @@ getTaskObjects()) ); Guid vdsmTaskId = taskCreationInfo.getVdsmTaskId(); - getReturnValue().getTaskIdList().add(vdsmTaskId); + getReturnValue().getVdsmTaskIdList().add(vdsmTaskId); if (isRevertedTask) { log.infoFormat("Reverting task {0} with ID {1} on DataCenter {2}.", taskCreationInfo.getTaskType().name(), vdsmTaskId, taskCreationInfo.getStoragePoolID()); } 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 410125f..f3f161d 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 @@ -388,7 +388,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext(), getLock())); // Setting lock to null because the lock is released in the child command setLock(null); - getReturnValue().getTaskIdList().addAll(tmpRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(tmpRetValue.getInternalVdsmTaskIdList()); if (tmpRetValue.getActionReturnValue() != null) { DiskImage diskImage = (DiskImage) tmpRetValue.getActionReturnValue(); addDiskPermissions(diskImage); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index 6737041..ec1e8b7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -91,7 +91,7 @@ getParameters().getParentCommand(), VdcObjectType.Storage, getParameters().getStorageDomainId())); - getReturnValue().getInternalTaskIdList().add(getParameters().getTaskIds().get(0)); + getReturnValue().getInternalVdsmTaskIdList().add(getParameters().getTaskIds().get(0)); return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java index 3449927..5a2ae1a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndAttachToPoolCommand.java @@ -31,7 +31,7 @@ } if (returnValueFromAddVm.getSucceeded()) { - getTaskIdList().addAll(returnValueFromAddVm.getInternalTaskIdList()); + getTaskIdList().addAll(returnValueFromAddVm.getInternalVdsmTaskIdList()); addVmToPool(vmStatic); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java index 48fba43..1ac25bf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java @@ -168,7 +168,7 @@ throw new VdcBLLException(VdcBllErrors.VolumeCreationError); } else { ImagesHandler.addDiskImageWithNoVmDevice(copiedDiskImage); - getTaskIdList().addAll(result.getInternalTaskIdList()); + getTaskIdList().addAll(result.getInternalVdsmTaskIdList()); newDiskImages.add(copiedDiskImage); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java index 777f494..de76579 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java @@ -667,7 +667,7 @@ if (!result.getSucceeded()) { throw new VdcBLLException(result.getFault().getError()); } else { - getTaskIdList().addAll(result.getInternalTaskIdList()); + getTaskIdList().addAll(result.getInternalVdsmTaskIdList()); newDiskImages.add((DiskImage) result.getActionReturnValue()); } } @@ -679,7 +679,7 @@ public AuditLogType getAuditLogTypeValue() { switch (getActionState()) { case EXECUTE: - return getSucceeded() ? (getReturnValue().getTaskIdList().size() > 0 ? AuditLogType.USER_ADD_VM_STARTED + return getSucceeded() ? (getReturnValue().getVdsmTaskIdList().size() > 0 ? AuditLogType.USER_ADD_VM_STARTED : AuditLogType.USER_ADD_VM) : AuditLogType.USER_FAILED_ADD_VM; case END_SUCCESS: diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java index b483ea8..874d6d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromScratchCommand.java @@ -109,7 +109,7 @@ else // the AddImageFromScratch task created ended successfully: { - getReturnValue().getTaskIdList().addAll(tmpRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(tmpRetValue.getInternalVdsmTaskIdList()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java index 710dedb..0ee9e8e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java @@ -112,7 +112,7 @@ if (!result.getSucceeded()) { throw new VdcBLLException(VdcBllErrors.VolumeCreationError); } else { - getTaskIdList().addAll(result.getInternalTaskIdList()); + getTaskIdList().addAll(result.getInternalVdsmTaskIdList()); newDiskImages.add((DiskImage) result.getActionReturnValue()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index 8194847..2c4c742 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -146,7 +146,7 @@ // means that there are no asynchronous tasks to execute and that we can // end the command synchronously - boolean pendingAsyncTasks = !getReturnValue().getTaskIdList().isEmpty(); + boolean pendingAsyncTasks = !getReturnValue().getVdsmTaskIdList().isEmpty(); if (!pendingAsyncTasks) { endSuccessfullySynchronous(); } @@ -375,7 +375,7 @@ throw new VdcBLLException(retValue.getFault().getError(), retValue.getFault().getMessage()); } - getReturnValue().getTaskIdList().addAll(retValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(retValue.getInternalVdsmTaskIdList()); newDiskImages.add((DiskImage) retValue.getActionReturnValue()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java index c2e4ee0..fe17e2d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AttachUserToVmFromPoolAndRunCommand.java @@ -212,10 +212,10 @@ VdcReturnValueBase vdcReturnValue = Backend.getInstance().runInternalAction(VdcActionType.RunVm, runVmParams, new CommandContext(runVmContext)); - getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); setSucceeded(vdcReturnValue.getSucceeded()); setActionReturnValue(vmToAttach); - getReturnValue().getTaskIdList().addAll(getReturnValue().getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(getReturnValue().getInternalVdsmTaskIdList()); } else { // no need to start, just return it setActionReturnValue(vmToAttach); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java index f095bb0..e2156fd 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java @@ -1203,7 +1203,7 @@ } private boolean hasTasks() { - return !getReturnValue().getTaskIdList().isEmpty(); + return !getReturnValue().getVdsmTaskIdList().isEmpty(); } private boolean getForceCompensation() { @@ -1460,12 +1460,12 @@ } protected void startPollingAsyncTasks() { - startPollingAsyncTasks(getReturnValue().getTaskIdList()); + startPollingAsyncTasks(getReturnValue().getVdsmTaskIdList()); } protected ArrayList<Guid> getTaskIdList() { - return getParameters().getParentCommand() != VdcActionType.Unknown ? getReturnValue().getInternalTaskIdList() - : getReturnValue().getTaskIdList(); + return getParameters().getParentCommand() != VdcActionType.Unknown ? getReturnValue().getInternalVdsmTaskIdList() + : getReturnValue().getVdsmTaskIdList(); } @Override @@ -1488,7 +1488,7 @@ public void run() { log.infoFormat("Rollback for command: {0}.", CommandBase.this.getClass().getName()); try { - getAsyncTaskManager().CancelTasks(getReturnValue().getTaskIdList()); + getAsyncTaskManager().CancelTasks(getReturnValue().getVdsmTaskIdList()); } catch (Exception e) { log.errorFormat("Failed to cancel tasks for command: {0}.", CommandBase.this.getClass().getName()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java index affbf5d..064f0a6 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateAllSnapshotsFromVmCommand.java @@ -142,7 +142,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcReturnValue.getSucceeded()) { - getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } else { throw new VdcBLLException(vdcReturnValue.getFault().getError(), "CreateAllSnapshotsFromVmCommand::executeVmCommand: Failed to create snapshot!"); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java index 56a2924..426804e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java @@ -72,7 +72,7 @@ false, getStoragePool().getcompatibility_version().toString())); if (vdsReturnValue.getSucceeded()) { - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, vdsReturnValue.getCreationInfo(), VdcActionType.AddVmFromTemplate, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java index fa08e19..a4681ac 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java @@ -66,7 +66,7 @@ .isWipeAfterDelete(), false, getStoragePool().getcompatibility_version() .toString())); - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, vdsReturnValue.getCreationInfo(), VdcActionType.AddVmTemplate, @@ -142,7 +142,7 @@ VdcReturnValueBase returnValue = checkAndPerformRollbackUsingCommand(VdcActionType.RemoveImage, p); if (returnValue.getSucceeded()) { - startPollingAsyncTasks(returnValue.getInternalTaskIdList()); + startPollingAsyncTasks(returnValue.getInternalVdsmTaskIdList()); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java index 94308a3..0fe8cee 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java @@ -122,7 +122,7 @@ VdcObjectType.Storage, getParameters().getStorageDomainId(), getParameters().getDestinationImageId())); - getReturnValue().getInternalTaskIdList().add(getParameters().getTaskIds().get(0)); + getReturnValue().getInternalVdsmTaskIdList().add(getParameters().getTaskIds().get(0)); // Shouldn't happen anymore: if (getDestinationImageId().equals(Guid.Empty)) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java index bcd1bc8..e405d14 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmCommand.java @@ -198,7 +198,7 @@ } }); - if (!getReturnValue().getTaskIdList().isEmpty()) { + if (!getReturnValue().getVdsmTaskIdList().isEmpty()) { setSucceeded(true); } } @@ -300,7 +300,7 @@ throw new VdcBLLException(vdcRetValue.getFault().getError(), "Failed during ExportVmCommand"); } - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java index 973af35..2d5560d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExportVmTemplateCommand.java @@ -75,7 +75,7 @@ .getMessage()); } - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); } return null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java index bdf88bc..882223a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HibernateVmCommand.java @@ -147,7 +147,7 @@ VdcActionType.HibernateVm, VdcObjectType.Storage, getStorageDomainId().getValue()); - getReturnValue().getTaskIdList().add(guid1); + getReturnValue().getVdsmTaskIdList().add(guid1); Guid taskId2 = this.createAsyncTask(VdcActionType.HibernateVm); getReturnValue().getAsyncTaskIdList().add(taskId2); @@ -178,7 +178,7 @@ return; } Guid guid2 = createTask(taskId2, ret2.getCreationInfo(), VdcActionType.HibernateVm); - getReturnValue().getTaskIdList().add(guid2); + getReturnValue().getVdsmTaskIdList().add(guid2); // this is the new param that should be passed to the hibernate // command diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java index 9e01868..f2d9b83 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java @@ -621,7 +621,7 @@ "ImportVmCommand::MoveOrCopyAllImageGroups: Failed to copy disk!"); } - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); i++; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java index 8186694..9ab24f5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmTemplateCommand.java @@ -308,7 +308,7 @@ : new VdcBLLException(VdcBllErrors.ENGINE)); } - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); i++; } return null; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java index 27cde95..4c7ba21 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java @@ -265,7 +265,7 @@ getReturnValue().setFault(vdcRetValue.getFault()); } else { setSucceeded(true); - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java index 1afbd32..a8147e4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyImageGroupCommand.java @@ -108,7 +108,7 @@ if (vdsReturnValue.getSucceeded()) { AsyncTaskCreationInfo taskCreationInfo = vdsReturnValue.getCreationInfo(); - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, taskCreationInfo, getParameters().getParentCommand(), @@ -217,7 +217,7 @@ if (returnValue.getSucceeded()) { // Starting to monitor the the tasks - RemoveImage is an internal command // which adds the taskId on the internal task ID list - startPollingAsyncTasks(returnValue.getInternalTaskIdList()); + startPollingAsyncTasks(returnValue.getInternalVdsmTaskIdList()); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java index d53fce8..6f94d1a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyTemplateCommand.java @@ -175,7 +175,7 @@ p, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); } return null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java index 10b4ff0..47406d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmImagesCommand.java @@ -56,7 +56,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcReturnValue.getSucceeded()) { - getReturnValue().getInternalTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getReturnValue().getInternalVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } else { failedRemoving.add(image); log.errorFormat("Can't remove image id: {0} for VM id: {1} due to: {2}. Image will be set at illegal state with no snapshot id.", diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java index 60f3310..b771b00 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java @@ -54,7 +54,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcReturnValue.getSucceeded()) { - getReturnValue().getInternalTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getReturnValue().getInternalVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } else { if (noImagesRemovedYet) { setSucceeded(false); 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 b80bc3b..6d0ba88 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 @@ -252,7 +252,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcReturnValue.getSucceeded()) { incrementVmsGeneration(); - getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); setSucceeded(true); } } else { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java index b19743a..ca3f3a7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveImageCommand.java @@ -84,7 +84,7 @@ getReturnValue().getAsyncTaskIdList().add(taskId); VDSReturnValue vdsReturnValue = performImageVdsmOperation(); - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, vdsReturnValue.getCreationInfo(), getParameters().getParentCommand(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java index 5ffdd25..552daf1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotCommand.java @@ -131,8 +131,8 @@ p, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); - if (vdcReturnValue != null && vdcReturnValue.getInternalTaskIdList() != null) { - getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + if (vdcReturnValue != null && vdcReturnValue.getInternalVdsmTaskIdList() != null) { + getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } List<Guid> quotasToRemoveFromCache = new ArrayList<Guid>(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java index c1d1b39..4673a22 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveSnapshotSingleDiskCommand.java @@ -49,7 +49,7 @@ .toString())); if (vdsReturnValue != null && vdsReturnValue.getCreationInfo() != null) { - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, vdsReturnValue.getCreationInfo(), VdcActionType.RemoveSnapshot, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java index 9f2bfc6..029fa04 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveTemplateSnapshotCommand.java @@ -35,7 +35,7 @@ .getWipeAfterDelete(), false, getStoragePool().getcompatibility_version().toString())); if (vdsReturnValue.getSucceeded()) { - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, vdsReturnValue.getCreationInfo(), VdcActionType.RemoveVmTemplate, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java index 44f11fe..c9677d0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java @@ -228,7 +228,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcRetValue.getSucceeded()) { - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); } return vdcRetValue; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java index 4806711..e15b750 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateCommand.java @@ -241,7 +241,7 @@ return false; } - getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java index 9d953bd..161122b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmTemplateFromImportExportCommand.java @@ -119,7 +119,7 @@ tempVar2, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcRetValue.getSucceeded()) { - getReturnValue().getTaskIdList().addAll(vdcRetValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcRetValue.getInternalVdsmTaskIdList()); } else { getReturnValue().setFault(vdcRetValue.getFault()); setSucceeded(false); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java index edeee1b..348a4d1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreAllSnapshotsCommand.java @@ -174,7 +174,7 @@ taskType, params, ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); - getTaskIdList().addAll(returnValue.getInternalTaskIdList()); + getTaskIdList().addAll(returnValue.getInternalVdsmTaskIdList()); return returnValue; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java index e0b9ccd..8cb88c1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java @@ -116,7 +116,7 @@ .getcompatibility_version().toString())); if (vdsReturnValue.getSucceeded()) { - getReturnValue().getInternalTaskIdList().add( + getReturnValue().getInternalVdsmTaskIdList().add( createTask(taskId, vdsReturnValue.getCreationInfo(), VdcActionType.RestoreAllSnapshots, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java index 03d6c5e..5e981e9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java @@ -348,7 +348,7 @@ if (vdcReturnValue.getSucceeded()) { - getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); // save RunVmParams so we'll know how to run // the stateless VM in the EndAction part. VmHandler.updateDisksFromDb(getVm()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java index 56bb4fb..782ba50 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java @@ -164,7 +164,7 @@ ExecutionHandler.createDefaultContexForTasks(getExecutionContext())); if (vdcReturnValue.getSucceeded()) { - getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + getTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } else if (vdcReturnValue.getFault() != null) { // if we have a fault, forward it to the user throw new VdcBLLException(vdcReturnValue.getFault().getError(), vdcReturnValue.getFault() diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java index 48d0bca..cee277d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java @@ -34,7 +34,7 @@ parameters, commandContext); - enclosingCommand.getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + enclosingCommand.getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); if (!parameters.getTaskGroupSuccess()) { ExecutionHandler.endTaskJob(commandContext.getExecutionContext(), false); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java index bdd1c08..6a3b573 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveSnapshotTaskHandler.java @@ -37,7 +37,7 @@ Backend.getInstance().runInternalAction(VdcActionType.CreateAllSnapshotsFromVm, getCreateSnapshotParameters(), ExecutionHandler.createInternalJobContext()); - enclosingCommand.getReturnValue().getTaskIdList().addAll(vdcReturnValue.getInternalTaskIdList()); + enclosingCommand.getReturnValue().getVdsmTaskIdList().addAll(vdcReturnValue.getInternalVdsmTaskIdList()); } enclosingCommand.getReturnValue().setSucceeded(true); } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java index b8e1943..64f7987 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase.java @@ -11,18 +11,18 @@ public class VdcReturnValueBase implements Serializable { private static final long serialVersionUID = 6063371142273092365L; - private boolean _canDoAction; - private ArrayList<String> _canDoActionMessages = new ArrayList<String>(); - private boolean _succeeded; - private boolean _isSyncronious; - private Object _returnValue; - private String _description = ""; + private boolean canDoAction; + private ArrayList<String> canDoActionMessages = new ArrayList<String>(); + private boolean succeeded; + private boolean isSyncronious; + private Object returnValue; + private String description = ""; private ArrayList<Guid> asyncTaskIdList = new ArrayList<Guid>(); - private ArrayList<Guid> taskIdList = new ArrayList<Guid>(); - private final ArrayList<Guid> _internalIdList = new ArrayList<Guid>(); - private boolean _endActionTryAgain = true; - private final ArrayList<String> _executeFailedMessages = new ArrayList<String>(); - private VdcFault _fault; + private ArrayList<Guid> vdsmTaskIdList = new ArrayList<Guid>(); + private final ArrayList<Guid> internalVdsmIdList = new ArrayList<Guid>(); + private boolean endActionTryAgain = true; + private final ArrayList<String> executeFailedMessages = new ArrayList<String>(); + private VdcFault fault; private String correlationId; private NGuid jobId; @@ -30,76 +30,76 @@ } public VdcFault getFault() { - if (_fault == null) { - _fault = new VdcFault(); - _fault.setError(VdcBllErrors.ENGINE); - _fault.setMessage(VdcBllErrors.ENGINE.name()); + if (fault == null) { + fault = new VdcFault(); + fault.setError(VdcBllErrors.ENGINE); + fault.setMessage(VdcBllErrors.ENGINE.name()); } - return _fault; + return fault; } public void setFault(VdcFault value) { - _fault = value; + fault = value; } public boolean getCanDoAction() { - return _canDoAction; + return canDoAction; } public void setCanDoAction(boolean value) { - _canDoAction = value; + canDoAction = value; } public ArrayList<String> getCanDoActionMessages() { - return _canDoActionMessages; + return canDoActionMessages; } public void setCanDoActionMessages(ArrayList<String> value) { - _canDoActionMessages = value; + canDoActionMessages = value; } public boolean getSucceeded() { - return _succeeded; + return succeeded; } public void setSucceeded(boolean value) { - _succeeded = value; + succeeded = value; } public ArrayList<String> getExecuteFailedMessages() { - return _executeFailedMessages; + return executeFailedMessages; } public Object getActionReturnValue() { - return _returnValue; + return returnValue; } public void setActionReturnValue(Object value) { - _returnValue = value; + returnValue = value; } public String getDescription() { - return _description; + return description; } public void setDescription(String value) { - _description = value; + description = value; } public boolean getIsSyncronious() { - return _isSyncronious; + return isSyncronious; } public void setIsSyncronious(boolean value) { - _isSyncronious = value; + isSyncronious = value; } - public ArrayList<Guid> getTaskIdList() { - return taskIdList; + public ArrayList<Guid> getVdsmTaskIdList() { + return vdsmTaskIdList; } - public void setTaskIdList(ArrayList<Guid> value) { - taskIdList = value; + public void setVdsmTaskIdList(ArrayList<Guid> value) { + vdsmTaskIdList = value; } public ArrayList<Guid> getAsyncTaskIdList() { @@ -110,20 +110,20 @@ asyncTaskIdList = value; } - public ArrayList<Guid> getInternalTaskIdList() { - return _internalIdList; + public ArrayList<Guid> getInternalVdsmTaskIdList() { + return internalVdsmIdList; } public boolean getHasAsyncTasks() { - return (getTaskIdList() != null && getTaskIdList().size() > 0); + return (getVdsmTaskIdList() != null && getVdsmTaskIdList().size() > 0); } public boolean getEndActionTryAgain() { - return _endActionTryAgain; + return endActionTryAgain; } public void setEndActionTryAgain(boolean value) { - _endActionTryAgain = value; + endActionTryAgain = value; } public void setCorrelationId(String correlationId) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java index cd5a4d0..9e1e91b 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java @@ -190,7 +190,7 @@ protected Response actionAsync(VdcReturnValueBase actionResult, Action action) { action.setAsync(true); - String ids = asString(actionResult.getTaskIdList()); + String ids = asString(actionResult.getVdsmTaskIdList()); action.setId(ids); action.setHref(UriBuilder.fromPath(getPath(uriInfo)).path(ids).build().toString()); String path = getPath(uriInfo); diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java index 40dd464..ffcfcdc 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java @@ -142,7 +142,7 @@ protected void handleAsynchrony(VdcReturnValueBase result, R model) { model.setCreationStatus(StatusUtils.create(getAsynchronousStatus(result))); - linkSubResource(model, CREATION_STATUS_REL, asString(result.getTaskIdList())); + linkSubResource(model, CREATION_STATUS_REL, asString(result.getVdsmTaskIdList())); } @SuppressWarnings("unchecked") diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java index 973e530..8e65db1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java @@ -124,7 +124,7 @@ private CreationStatus getVdsmTasksStatus(VdcReturnValueBase result) { CreationStatus asyncStatus = null; VdcQueryReturnValue monitorResult = - runQuery(VdcQueryType.GetTasksStatusesByTasksIDs, new GetTasksStatusesByTasksIDsParameters(result.getTaskIdList())); + runQuery(VdcQueryType.GetTasksStatusesByTasksIDs, new GetTasksStatusesByTasksIDsParameters(result.getVdsmTaskIdList())); if (monitorResult != null && monitorResult.getSucceeded() && monitorResult.getReturnValue() != null) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java index 0cf7cdd..750e791 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendBaseTest.java @@ -450,7 +450,7 @@ VdcQueryReturnValue monitorResult, VdcReturnValueBase result) { if (asyncTasks != null) { - expect(result.getTaskIdList()).andReturn(asyncTasks).anyTimes(); + expect(result.getVdsmTaskIdList()).andReturn(asyncTasks).anyTimes(); expect(monitorResult.getReturnValue()).andReturn(asyncStatuses).anyTimes(); expect(backend.RunQuery(eq(VdcQueryType.GetTasksStatusesByTasksIDs), eqQueryParams(GetTasksStatusesByTasksIDsParameters.class, diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java index 2424498..e6577fe 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java @@ -253,7 +253,7 @@ } expect(taskResult.getHasAsyncTasks()).andReturn(asyncTasks != null).anyTimes(); if (asyncTasks != null) { - expect(taskResult.getTaskIdList()).andReturn(asyncTasks).anyTimes(); + expect(taskResult.getVdsmTaskIdList()).andReturn(asyncTasks).anyTimes(); VdcQueryReturnValue monitorResult = control.createMock(VdcQueryReturnValue.class); expect(monitorResult.getSucceeded()).andReturn(success).anyTimes(); expect(monitorResult.getReturnValue()).andReturn(asyncStatuses).anyTimes(); diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase_CustomFieldSerializer.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase_CustomFieldSerializer.java index bbf7e42..fa6a869 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase_CustomFieldSerializer.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/core/common/action/VdcReturnValueBase_CustomFieldSerializer.java @@ -32,7 +32,7 @@ vrvb.setAsyncTaskIdList(asyncTaskIdList); java.util.ArrayList<Guid> taskIdList = (java.util.ArrayList<Guid>) streamReader .readObject(); - vrvb.setTaskIdList(taskIdList); + vrvb.setVdsmTaskIdList(taskIdList); vrvb.setEndActionTryAgain(streamReader.readBoolean()); vrvb.setFault((VdcFault)streamReader.readObject()); @@ -49,7 +49,7 @@ streamWriter.writeObject(instance.getActionReturnValue()); streamWriter.writeString(instance.getDescription()); streamWriter.writeObject(instance.getAsyncTaskIdList()); - streamWriter.writeObject(instance.getTaskIdList()); + streamWriter.writeObject(instance.getVdsmTaskIdList()); streamWriter.writeBoolean(instance.getEndActionTryAgain()); streamWriter.writeObject(instance.getFault()); } -- To view, visit http://gerrit.ovirt.org/14909 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iebfbd19f8eeef4a9a0d30eadaacb1d833cae0ec7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
