Arik Hadas has uploaded a new change for review. Change subject: core: change RemoveVmFromImportExportParamenters to get VM ID ......................................................................
core: change RemoveVmFromImportExportParamenters to get VM ID RemoveVmFromImportExportCommand only needs the ID of the VM to work with, yet RemoveVmFromImportExportParamenters received VM object. at the REST API and at the UI we were creating VM object just as a wrapper of the VM ID to pass to the parameters class. This patch changes the parameter class to receive ID of VM instead of VM object. This patch also contains minor refactoring in RemoveVmFromImportExportParamenters class. Change-Id: I0fff20548248d3c47087d2d004d285c429a1c081 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveVmFromImportExportParamenters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java 4 files changed, 16 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/07/16707/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveVmFromImportExportParamenters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveVmFromImportExportParamenters.java index 69fea35..30170d1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveVmFromImportExportParamenters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveVmFromImportExportParamenters.java @@ -1,43 +1,35 @@ package org.ovirt.engine.core.common.action; -import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.core.compat.Guid; public class RemoveVmFromImportExportParamenters extends RemoveVmParameters implements java.io.Serializable { private static final long serialVersionUID = 1841755064122049392L; - private VM _vm; - public RemoveVmFromImportExportParamenters(VM vm, Guid storageDomainId, Guid storagePoolId) { - super(vm.getId(), false); - _vm = vm; - this.setStorageDomainId(storageDomainId); - this.setStoragePoolId(storagePoolId); + private Guid storagePoolId = Guid.Empty; + private Guid storageDomainId = Guid.Empty; + + public RemoveVmFromImportExportParamenters() { } - public VM getVm() { - return _vm; + public RemoveVmFromImportExportParamenters(Guid vmId, Guid storageDomainId, Guid storagePoolId) { + super(vmId, false); + setStorageDomainId(storageDomainId); + setStoragePoolId(storagePoolId); } - - private Guid privateStorageDomainId = Guid.Empty; public Guid getStorageDomainId() { - return privateStorageDomainId; + return storageDomainId; } public void setStorageDomainId(Guid value) { - privateStorageDomainId = value; + storageDomainId = value; } - private Guid privateStoragePoolId = Guid.Empty; - public Guid getStoragePoolId() { - return privateStoragePoolId; + return storagePoolId; } public void setStoragePoolId(Guid value) { - privateStoragePoolId = value; - } - - public RemoveVmFromImportExportParamenters() { + storagePoolId = value; } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java index 327a591..1a44708 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResource.java @@ -51,10 +51,8 @@ @Override public Response performRemove(String id) { - org.ovirt.engine.core.common.businessentities.VM vm = new org.ovirt.engine.core.common.businessentities.VM(); - vm.setId(Guid.createGuidFromStringDefaultEmpty(id)); RemoveVmFromImportExportParamenters params = new RemoveVmFromImportExportParamenters( - vm, + Guid.createGuidFromStringDefaultEmpty(id), storageDomainId, getDataCenterId(storageDomainId)); return performAction(VdcActionType.RemoveVmFromImportExport, params); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java index e79f121..07bdad2 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java @@ -82,10 +82,8 @@ setUriInfo(setUpBasicUriExpectations()); setUpQueryExpectations("", null, StorageDomainType.ImportExport, false); setUpGetDataCenterByStorageDomainExpectations(GUIDS[3], 2); - org.ovirt.engine.core.common.businessentities.VM vm = new org.ovirt.engine.core.common.businessentities.VM(); - vm.setId(GUIDS[0]); - String[] names = new String[]{"Vm", "StorageDomainId", "StoragePoolId"}; - Object[] values = new Object[]{vm, GUIDS[3], DATA_CENTER_ID}; + String[] names = new String[]{"VmId", "StorageDomainId", "StoragePoolId"}; + Object[] values = new Object[]{GUIDS[0], GUIDS[3], DATA_CENTER_ID}; setUpActionExpectations(VdcActionType.RemoveVmFromImportExport, RemoveVmFromImportExportParamenters.class, names, values, true, true); verifyRemove(collection.remove(GUIDS[0].toString())); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 569e89d..cfc435d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -141,7 +141,7 @@ new ArrayList<VdcActionParametersBase>(); for (Object item : backupModel.getSelectedItems()) { VM vm = (VM) item; - list.add(new RemoveVmFromImportExportParamenters(vm, + list.add(new RemoveVmFromImportExportParamenters(vm.getId(), backupModel.getEntity().getId(), pool.getId())); } -- To view, visit http://gerrit.ovirt.org/16707 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fff20548248d3c47087d2d004d285c429a1c081 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
