Arik Hadas has uploaded a new change for review. Change subject: core: remove AddVmFromTemplateParameters ......................................................................
core: remove AddVmFromTemplateParameters No need for this parameters class, VmManagementParametersBase will be used instead. Change-Id: I9241a0f402e829e9b029cbecf8cc05e10d6a6dda Signed-off-by: Arik Hadas <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java D backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromTemplateParameters.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/BackendVmsResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 8 files changed, 21 insertions(+), 58 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/32491/1 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 d8d6870..d7a9f6c 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 @@ -9,12 +9,12 @@ import org.ovirt.engine.core.bll.validator.DiskImagesValidator; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.CreateCloneOfTemplateParameters; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.LockProperties.Scope; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.action.VdcReturnValueBase; +import org.ovirt.engine.core.common.action.VmManagementParametersBase; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.DiskImageBase; import org.ovirt.engine.core.common.businessentities.Entities; @@ -32,7 +32,7 @@ /** * This class adds a cloned VM from a template (Deep disk copy) */ -public class AddVmFromTemplateCommand<T extends AddVmFromTemplateParameters> extends AddVmCommand<T> { +public class AddVmFromTemplateCommand<T extends VmManagementParametersBase> extends AddVmCommand<T> { private Map<Guid, Guid> diskInfoSourceMap; private Map<Guid, Set<Guid>> validDisksDomains; @@ -57,7 +57,6 @@ @Override protected void executeVmCommand() { super.executeVmCommand(); - getParameters().originalTemplate = getVm().getVmtGuid(); getVm().setVmtGuid(VmTemplateHandler.BLANK_VM_TEMPLATE_ID); getVm().getStaticData().setQuotaId(getParameters().getVmStaticData().getQuotaId()); DbFacade.getInstance().getVmStaticDao().update(getVm().getStaticData()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java index bd1ed9c..4ff5508 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java @@ -36,7 +36,6 @@ import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; import org.ovirt.engine.core.common.action.AddVmFromSnapshotParameters; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.VmManagementParametersBase; import org.ovirt.engine.core.common.businessentities.ArchitectureType; import org.ovirt.engine.core.common.businessentities.DiskImage; @@ -132,7 +131,7 @@ @Test public void create10GBVmWith11GbAvailableAndA5GbBuffer() throws Exception { VM vm = createVm(); - AddVmFromTemplateCommand<AddVmFromTemplateParameters> cmd = createVmFromTemplateCommand(vm); + AddVmFromTemplateCommand<VmManagementParametersBase> cmd = createVmFromTemplateCommand(vm); mockStorageDomainDAOGetForStoragePool(); mockVdsGroupDAOReturnVdsGroup(); @@ -208,7 +207,7 @@ @Test public void canAddVmWithVirtioScsiControllerNotSupportedOs() { VM vm = createVm(); - AddVmFromTemplateCommand<AddVmFromTemplateParameters> cmd = createVmFromTemplateCommand(vm); + AddVmFromTemplateCommand<VmManagementParametersBase> cmd = createVmFromTemplateCommand(vm); VDSGroup vdsGroup = createVdsGroup(); @@ -294,11 +293,11 @@ doReturn(MAX_PCI_SLOTS).when(osRepository).getMaxPciDevices(anyInt(), any(Version.class)); } - protected AddVmFromTemplateCommand<AddVmFromTemplateParameters> createVmFromTemplateCommand(VM vm) { - AddVmFromTemplateParameters param = new AddVmFromTemplateParameters(); + protected AddVmFromTemplateCommand<VmManagementParametersBase> createVmFromTemplateCommand(VM vm) { + VmManagementParametersBase param = new VmManagementParametersBase(); param.setVm(vm); - AddVmFromTemplateCommand<AddVmFromTemplateParameters> concrete = - new AddVmFromTemplateCommand<AddVmFromTemplateParameters>(param) { + AddVmFromTemplateCommand<VmManagementParametersBase> concrete = + new AddVmFromTemplateCommand<VmManagementParametersBase>(param) { @Override protected void initTemplateDisks() { // Stub for testing @@ -314,7 +313,7 @@ return createVmTemplate(); } }; - AddVmFromTemplateCommand<AddVmFromTemplateParameters> result = spy(concrete); + AddVmFromTemplateCommand<VmManagementParametersBase> result = spy(concrete); doReturn(true).when(result).checkNumberOfMonitors(); doReturn(createVmTemplate()).when(result).getVmTemplate(); doReturn(Collections.emptyList()).when(result).validateCustomProperties(any(VmStatic.class)); @@ -603,7 +602,7 @@ return disksList; } - private void mockGetAllSnapshots(AddVmFromTemplateCommand<AddVmFromTemplateParameters> command) { + private void mockGetAllSnapshots(AddVmFromTemplateCommand<VmManagementParametersBase> command) { doAnswer(new Answer<List<DiskImage>>() { @Override public List<DiskImage> answer(InvocationOnMock invocation) throws Throwable { diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java index ca2c356..3f3c376 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmFromTemplateCommandTest.java @@ -20,7 +20,7 @@ import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.ovirt.engine.core.bll.validator.StorageDomainValidator; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; +import org.ovirt.engine.core.common.action.VmManagementParametersBase; import org.ovirt.engine.core.common.businessentities.DiskImage; import org.ovirt.engine.core.common.businessentities.ImageStatus; import org.ovirt.engine.core.common.businessentities.StorageDomain; @@ -34,7 +34,7 @@ /** * The command under test. */ - protected AddVmFromTemplateCommand<AddVmFromTemplateParameters> command; + protected AddVmFromTemplateCommand<VmManagementParametersBase> command; @Test public void validateSpaceAndThreshold() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromTemplateParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromTemplateParameters.java deleted file mode 100644 index 8df2afc..0000000 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromTemplateParameters.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.ovirt.engine.core.common.action; - -import java.util.HashMap; - -import org.ovirt.engine.core.common.businessentities.DiskImage; -import org.ovirt.engine.core.common.businessentities.VM; -import org.ovirt.engine.core.common.businessentities.VmStatic; -import org.ovirt.engine.core.compat.Guid; - -public class AddVmFromTemplateParameters extends VmManagementParametersBase { - private static final long serialVersionUID = -3400982291165788716L; - - public Guid originalTemplate; - - public AddVmFromTemplateParameters(VmStatic vmStatic, HashMap<Guid, DiskImage> diskInfoDestinationMap, - Guid storageDomainId) { - super(vmStatic); - setStorageDomainId(storageDomainId); - setDiskInfoDestinationMap(diskInfoDestinationMap); - originalTemplate = Guid.Empty; - } - - public AddVmFromTemplateParameters() { - originalTemplate = Guid.Empty; - } - - public AddVmFromTemplateParameters(VM vm, HashMap<Guid, DiskImage> diskInfoDestinationMap, Guid storageDomainId) { - this(vm.getStaticData(), diskInfoDestinationMap, storageDomainId); - } -} 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 45625e4..e2c197a 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,6 @@ import org.ovirt.engine.api.restapi.util.VmHelper; import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; import org.ovirt.engine.core.common.action.AddVmFromSnapshotParameters; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.ImportVmParameters; import org.ovirt.engine.core.common.action.RemoveVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -311,7 +310,8 @@ } private Response cloneVmFromTemplate(VmStatic staticVm, VM vm, Guid templateId) { - AddVmFromTemplateParameters params = new AddVmFromTemplateParameters(staticVm, getDisksToClone(vm.getDisks(), templateId), Guid.Empty); + VmManagementParametersBase params = new VmManagementParametersBase(staticVm); + params.setDiskInfoDestinationMap(getDisksToClone(vm.getDisks(), templateId)); params.setVmPayload(getPayload(vm)); params.setVirtioScsiEnabled(vm.isSetVirtioScsi() && vm.getVirtioScsi().isSetEnabled() ? vm.getVirtioScsi().isEnabled() : null); diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java index bc32cda..ce5ee2e 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java @@ -33,7 +33,6 @@ import org.ovirt.engine.api.restapi.utils.OsTypeMockUtils; import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; import org.ovirt.engine.core.common.action.AddVmFromSnapshotParameters; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.ImportVmParameters; import org.ovirt.engine.core.common.action.RemoveVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -524,7 +523,7 @@ new Object[] { GUIDS[2] }, getVdsGroupEntity()); setUpCreationExpectations(VdcActionType.AddVmFromTemplate, - AddVmFromTemplateParameters.class, + VmManagementParametersBase.class, new String[] { "StorageDomainId" }, new Object[] { GUIDS[0] }, true, @@ -607,7 +606,7 @@ new Object[] { GUIDS[2] }, getVdsGroupEntity()); setUpCreationExpectations(VdcActionType.AddVmFromTemplate, - AddVmFromTemplateParameters.class, + VmManagementParametersBase.class, new String[] { "StorageDomainId" }, new Object[] { GUIDS[0] }, true, @@ -1139,7 +1138,7 @@ getVdsGroupEntity()); setUpCreationExpectations(VdcActionType.AddVmFromTemplate, - AddVmFromTemplateParameters.class, + VmManagementParametersBase.class, new String[] { "StorageDomainId", "CopyTemplatePermissions" }, new Object[] { GUIDS[0], copy }, true, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index f3b76b3..17e91b7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -9,7 +9,6 @@ import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.AddVmTemplateParameters; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.action.ChangeVMClusterParameters; @@ -1122,9 +1121,8 @@ VM vm = gettempVm(); vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName())); - AddVmFromTemplateParameters param = new AddVmFromTemplateParameters(vm, - unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(), - Guid.Empty); + VmManagementParametersBase param = new VmManagementParametersBase(vm); + param.setDiskInfoDestinationMap(unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap()); param.setMakeCreatorExplicitOwner(true); param.setCopyTemplatePermissions(unitVmModel.getCopyPermissions().getEntity()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 8fad669..6e75925 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; -import org.ovirt.engine.core.common.action.AddVmFromTemplateParameters; import org.ovirt.engine.core.common.action.AddVmTemplateParameters; import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; @@ -2200,9 +2199,8 @@ VM vm = vmListModel.getcurrentVm(); vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName())); - AddVmFromTemplateParameters param = new AddVmFromTemplateParameters(vm, - unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(), - Guid.Empty); + VmManagementParametersBase param = new VmManagementParametersBase(vm); + param.setDiskInfoDestinationMap(unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap()); param.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); param.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity()); param.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity()); -- To view, visit http://gerrit.ovirt.org/32491 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9241a0f402e829e9b029cbecf8cc05e10d6a6dda 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
