Arik Hadas has uploaded a new change for review. Change subject: core: introduce ImportVmFromStorageDomainParameters ......................................................................
core: introduce ImportVmFromStorageDomainParameters Change-Id: Ibeb6dc9531a167e77ed9152bab21858bcd6ffc48 Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java A backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromStorageDomainParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmParameters.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java 9 files changed, 67 insertions(+), 50 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/34885/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java index f379fa6..8e25801 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmFromStorageDomainCommand.java @@ -30,7 +30,7 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.FeatureSupported; import org.ovirt.engine.core.common.VdcObjectType; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.LockProperties.Scope; import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters; @@ -51,10 +51,10 @@ import org.ovirt.engine.core.common.businessentities.DiskInterface; import org.ovirt.engine.core.common.businessentities.Entities; import org.ovirt.engine.core.common.businessentities.ImageDbOperationScope; +import org.ovirt.engine.core.common.businessentities.ImageOperation; import org.ovirt.engine.core.common.businessentities.Snapshot; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotStatus; import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType; -import org.ovirt.engine.core.common.businessentities.ImageOperation; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.StorageDomainType; @@ -103,7 +103,7 @@ @DisableInPrepareMode @NonTransactiveCommandAttribute(forceCompensation = true) -public class ImportVmFromStorageDomainCommand<T extends ImportVmParameters> extends ImportVmCommand<T> +public class ImportVmFromStorageDomainCommand<T extends ImportVmFromStorageDomainParameters> extends ImportVmCommand<T> implements QuotaStorageDependent, TaskHandlerCommand<T> { private static final Logger log = LoggerFactory.getLogger(ImportVmFromStorageDomainCommand.class); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java index 7806721..383c04b 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/ImportVMFromConfigurationCommandTest.java @@ -24,7 +24,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.businessentities.ArchitectureType; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.OvfEntityData; @@ -150,7 +150,7 @@ } private ImportVmParameters createParametersWhenImagesExistOnTargetStorageDomain() { - ImportVmParameters params = new ImportVmParameters(); + ImportVmFromStorageDomainParameters params = new ImportVmFromStorageDomainParameters(); params.setContainerId(vmId); params.setDestDomainId(storageDomainId); params.setVdsGroupId(clusterId); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromStorageDomainParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromStorageDomainParameters.java new file mode 100644 index 0000000..4ed9063 --- /dev/null +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromStorageDomainParameters.java @@ -0,0 +1,46 @@ +package org.ovirt.engine.core.common.action; + +import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.compat.Guid; + +public class ImportVmFromStorageDomainParameters extends ImportVmParameters { + private static final long serialVersionUID = -6581214462128774780L; + + private Guid sourceDomainId; + private boolean imagesExistOnTargetStorageDomain; + private boolean copyCollapse; + + public ImportVmFromStorageDomainParameters() { + sourceDomainId = Guid.Empty; + } + + public ImportVmFromStorageDomainParameters(VM vm, Guid sourceStorageDomainId, + Guid destStorageDomainId, Guid storagePoolId, Guid vdsGroupId) { + super(vm, destStorageDomainId, storagePoolId, vdsGroupId); + sourceDomainId = sourceStorageDomainId; + } + + public Guid getSourceDomainId() { + return sourceDomainId; + } + + public void setSourceDomainId(Guid sourceDomainId) { + this.sourceDomainId = sourceDomainId; + } + + public boolean isImagesExistOnTargetStorageDomain() { + return imagesExistOnTargetStorageDomain; + } + + public void setImagesExistOnTargetStorageDomain(boolean imagesExistOnTargetStorageDomain) { + this.imagesExistOnTargetStorageDomain = imagesExistOnTargetStorageDomain; + } + + public boolean getCopyCollapse() { + return copyCollapse; + } + + public void setCopyCollapse(boolean copyCollapse) { + this.copyCollapse = copyCollapse; + } +} \ No newline at end of file diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmParameters.java index 7b226bf..b8e99f7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmParameters.java @@ -14,7 +14,6 @@ @Valid private VM vm; - private Guid sourceDomainId; private Guid destDomainId; private Guid vdsGroupId; private Guid storagePoolId; @@ -22,30 +21,22 @@ private boolean importAsNewEntity; private Map<Guid, Guid> imageToDestinationDomainMap; - private boolean imagesExistOnTargetStorageDomain; private Guid cpuProfileId; - private boolean copyCollapse; private boolean forceOverride; private Guid containerId; public ImportVmParameters() { - sourceDomainId = Guid.Empty; destDomainId = Guid.Empty; } - public ImportVmParameters(VM vm, Guid sourceStorageDomainId, + public ImportVmParameters(VM vm, Guid destStorageDomainId, Guid storagePoolId, Guid vdsGroupId) { super(vm.getId()); this.vm = vm; containerId = vm.getId(); - sourceDomainId = sourceStorageDomainId; destDomainId = destStorageDomainId; setStoragePoolId(storagePoolId); setVdsGroupId(vdsGroupId); - } - - public Guid getSourceDomainId() { - return sourceDomainId; } public Guid getDestDomainId() { @@ -62,10 +53,6 @@ public void setDestDomainId(Guid destDomainId) { this.destDomainId = destDomainId; - } - - public void setSourceDomainId(Guid sourceDomainId) { - this.sourceDomainId = sourceDomainId; } public Map<Guid, Disk> getDiskMap() { @@ -92,14 +79,6 @@ this.importAsNewEntity = importAsNewEntity; } - public boolean isImagesExistOnTargetStorageDomain() { - return imagesExistOnTargetStorageDomain; - } - - public void setImagesExistOnTargetStorageDomain(boolean imagesExistOnTargetStorageDomain) { - this.imagesExistOnTargetStorageDomain = imagesExistOnTargetStorageDomain; - } - public Guid getCpuProfileId() { return cpuProfileId; } @@ -114,14 +93,6 @@ public void setContainerId(Guid containerId) { this.containerId = containerId; - } - - public boolean getCopyCollapse() { - return copyCollapse; - } - - public void setCopyCollapse(boolean copyCollapse) { - this.copyCollapse = copyCollapse; } public boolean getForceOverride() { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java index 026fc92..9bf379d 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResource.java @@ -8,7 +8,7 @@ import org.ovirt.engine.api.resource.ActionResource; import org.ovirt.engine.api.resource.StorageDomainContentDisksResource; import org.ovirt.engine.api.resource.StorageDomainContentResource; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -39,7 +39,7 @@ @Override public Response register(Action action) { validateParameters(action, "cluster.id|name"); - ImportVmParameters params = new ImportVmParameters(); + ImportVmFromStorageDomainParameters params = new ImportVmFromStorageDomainParameters(); params.setContainerId(guid); params.setStorageDomainId(parent.getStorageDomainId()); params.setVdsGroupId(getClusterId(action)); @@ -60,7 +60,7 @@ validateParameters(action, "cluster.id|name", "storageDomain.id|name"); Guid destStorageDomainId = getDestStorageDomainId(action); - ImportVmParameters params = new ImportVmParameters(getEntity(), + ImportVmFromStorageDomainParameters params = new ImportVmFromStorageDomainParameters(getEntity(), parent.getStorageDomainId(), destStorageDomainId, parent.getDataCenterId(destStorageDomainId), diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java index 620385c..315aa66 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java @@ -40,7 +40,7 @@ import org.ovirt.engine.api.restapi.util.VmHelper; import org.ovirt.engine.core.common.action.AddVmFromSnapshotParameters; import org.ovirt.engine.core.common.action.AddVmParameters; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.action.RemoveVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VmManagementParametersBase; @@ -233,7 +233,7 @@ VmMapper.map(vm, vmConfiguration.getStaticData()); Guid clusterId = namedCluster(vm) ? getClusterId(vm) : asGuid(vm.getCluster().getId()); - ImportVmParameters parameters = new ImportVmParameters(); + ImportVmFromStorageDomainParameters parameters = new ImportVmFromStorageDomainParameters(); parameters.setVm(vmConfiguration); parameters.setVdsGroupId(clusterId); if (initialization.isSetRegenerateIds()) { diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java index 863165e..5fcf417 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java @@ -19,7 +19,7 @@ import org.ovirt.engine.api.model.Snapshots; import org.ovirt.engine.api.model.StorageDomain; import org.ovirt.engine.api.model.VM; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus; @@ -189,7 +189,7 @@ public void doTestImport(StorageDomain storageDomain, Cluster cluster, boolean collapseSnapshots, boolean importAsNewEntity) throws Exception { setUpGetEntityExpectations(1, StorageDomainType.ImportExport, GUIDS[2]); setUriInfo(setUpActionExpectations(VdcActionType.ImportVmFromStorageDomain, - ImportVmParameters.class, + ImportVmFromStorageDomainParameters.class, new String[] { "ContainerId", "StorageDomainId", "SourceDomainId", "DestDomainId", "StoragePoolId", "VdsGroupId", "CopyCollapse", "ImportAsNewEntity" }, new Object[] { VM_ID, GUIDS[2], STORAGE_DOMAIN_ID, GUIDS[2], DATA_CENTER_ID, GUIDS[1], collapseSnapshots, importAsNewEntity })); @@ -211,7 +211,7 @@ public void doTestRegister(Cluster cluster, boolean importAsNewEntity) throws Exception { setUriInfo(setUpActionExpectations(VdcActionType.ImportVmFromConfiguration, - ImportVmParameters.class, + ImportVmFromStorageDomainParameters.class, new String[] { "ContainerId", "StorageDomainId", "VdsGroupId", "ImportAsNewEntity", "ImagesExistOnTargetStorageDomain"}, new Object[] { VM_ID, GUIDS[3], GUIDS[1], importAsNewEntity, true})); @@ -245,7 +245,7 @@ setUriInfo(setUpActionExpectations( VdcActionType.ImportVmFromStorageDomain, - ImportVmParameters.class, + ImportVmFromStorageDomainParameters.class, new String[] { "ContainerId", "StorageDomainId", "SourceDomainId", "DestDomainId", "StoragePoolId", "VdsGroupId" }, new Object[] { VM_ID, GUIDS[2], STORAGE_DOMAIN_ID, GUIDS[2], DATA_CENTER_ID, GUIDS[1] }, asList(GUIDS[1]), diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java index 8f2b5d0..c3e37a5 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/RegisterVmModel.java @@ -1,6 +1,8 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import java.util.ArrayList; + +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.Disk; @@ -12,8 +14,6 @@ import org.ovirt.engine.ui.uicompat.FrontendMultipleActionAsyncResult; import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; -import java.util.ArrayList; - public class RegisterVmModel extends RegisterEntityModel { protected void onSave() { @@ -22,7 +22,7 @@ VM vm = (VM) entityData.getEntity(); VDSGroup vdsGroup = entityData.getCluster().getSelectedItem(); - ImportVmParameters params = new ImportVmParameters(); + ImportVmFromStorageDomainParameters params = new ImportVmFromStorageDomainParameters(); params.setContainerId(vm.getId()); params.setStorageDomainId(getStorageDomainId()); params.setImagesExistOnTargetStorageDomain(true); 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 4fa9f2f..d546770 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 @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Set; -import org.ovirt.engine.core.common.action.ImportVmParameters; +import org.ovirt.engine.core.common.action.ImportVmFromStorageDomainParameters; import org.ovirt.engine.core.common.action.RemoveVmFromImportExportParameters; import org.ovirt.engine.core.common.action.VdcActionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; @@ -432,7 +432,7 @@ for (Object item : importModel.getItems()) { VM vm = ((ImportVmData) item).getVm(); - ImportVmParameters prm = new ImportVmParameters(vm, getEntity().getId(), + ImportVmFromStorageDomainParameters prm = new ImportVmFromStorageDomainParameters(vm, getEntity().getId(), Guid.Empty, importModel.getStoragePool().getId(), ((VDSGroup) importModel.getCluster().getSelectedItem()).getId()); -- To view, visit http://gerrit.ovirt.org/34885 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibeb6dc9531a167e77ed9152bab21858bcd6ffc48 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
