Arik Hadas has uploaded a new change for review.
Change subject: core: use AddVmParameters for other add-vm commands
......................................................................
core: use AddVmParameters for other add-vm commands
AddVmParameters is now used as a parameters class for AddVmFromTemplate
and AddVmFromScratch commands.
Change-Id: I64943e1538c6c796ab0cdf4da71ca820ff63b0ee
Signed-off-by: Arik Hadas <aha...@redhat.com>
---
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/AddVmFromTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.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
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.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
13 files changed, 51 insertions(+), 52 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/32642/1
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 3655617..86924d5 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
@@ -10,7 +10,6 @@
import org.ovirt.engine.core.common.action.LockProperties;
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.VmStatic;
import org.ovirt.engine.core.common.utils.Pair;
@@ -65,7 +64,7 @@
}
private VdcReturnValueBase addVm(VmStatic vmStatic) {
- VmManagementParametersBase parameters = new
VmManagementParametersBase(vmStatic);
+ AddVmParameters parameters = new AddVmParameters(vmStatic);
if (StringUtils.isEmpty(getParameters().getSessionId())) {
parameters.setParametersCurrentUser(getCurrentUser());
} else {
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 ae9e442..c9fd579 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
@@ -17,11 +17,11 @@
import org.ovirt.engine.core.bll.validator.VmValidator;
import org.ovirt.engine.core.common.AuditLogType;
import org.ovirt.engine.core.common.VdcObjectType;
+import org.ovirt.engine.core.common.action.AddVmParameters;
import org.ovirt.engine.core.common.action.MoveOrCopyImageGroupParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
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.asynctasks.EntityInfo;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
import org.ovirt.engine.core.common.businessentities.CopyVolumeType;
@@ -48,7 +48,7 @@
* This abstract class holds helper methods for concrete command classes that
require to add a VM and clone an image in
* the process
*/
-public abstract class AddVmAndCloneImageCommand<T extends
VmManagementParametersBase> extends AddVmCommand<T> {
+public abstract class AddVmAndCloneImageCommand<T extends AddVmParameters>
extends AddVmCommand<T> {
protected AddVmAndCloneImageCommand(Guid commandId) {
super(commandId);
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 33232a7..5edc85e 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
@@ -28,13 +28,13 @@
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.AddVmParameters;
import
org.ovirt.engine.core.common.action.CreateSnapshotFromTemplateParameters;
import org.ovirt.engine.core.common.action.LockProperties;
import org.ovirt.engine.core.common.action.LockProperties.Scope;
import org.ovirt.engine.core.common.action.RngDeviceParameters;
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.action.WatchdogParameters;
import org.ovirt.engine.core.common.asynctasks.EntityInfo;
import org.ovirt.engine.core.common.businessentities.ActionGroup;
@@ -93,7 +93,7 @@
*/
@DisableInPrepareMode
@NonTransactiveCommandAttribute
-public class AddVmCommand<T extends VmManagementParametersBase> extends
VmManagementCommandBase<T>
+public class AddVmCommand<T extends AddVmParameters> extends
VmManagementCommandBase<T>
implements QuotaStorageDependent, QuotaVdsDependent {
protected HashMap<Guid, DiskImage> diskInfoDestinationMap;
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 d7a9f6c..b6db61c3 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.AddVmParameters;
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 VmManagementParametersBase>
extends AddVmCommand<T> {
+public class AddVmFromTemplateCommand<T extends AddVmParameters> extends
AddVmCommand<T> {
private Map<Guid, Guid> diskInfoSourceMap;
private Map<Guid, Set<Guid>> validDisksDomains;
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java
index 2f18f1e..8a75c15 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmVersionCommand.java
@@ -12,6 +12,7 @@
import org.ovirt.engine.core.bll.job.ExecutionHandler;
import org.ovirt.engine.core.common.VdcObjectType;
import org.ovirt.engine.core.common.action.AddVmAndAttachToPoolParameters;
+import org.ovirt.engine.core.common.action.AddVmParameters;
import org.ovirt.engine.core.common.action.LockProperties;
import org.ovirt.engine.core.common.action.LockProperties.Scope;
import org.ovirt.engine.core.common.action.RemoveVmFromPoolParameters;
@@ -155,7 +156,7 @@
new HashMap<Guid, DiskImage>());
action = VdcActionType.AddVmAndAttachToPool;
} else {
- addVmParams = new
VmManagementParametersBase(getParameters().getVmStaticData());
+ addVmParams = new
AddVmParameters(getParameters().getVmStaticData());
action = VdcActionType.AddVm;
}
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 4ff5508..306c6f9 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,6 +36,7 @@
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.AddVmParameters;
import org.ovirt.engine.core.common.action.VmManagementParametersBase;
import org.ovirt.engine.core.common.businessentities.ArchitectureType;
import org.ovirt.engine.core.common.businessentities.DiskImage;
@@ -131,7 +132,7 @@
@Test
public void create10GBVmWith11GbAvailableAndA5GbBuffer() throws Exception {
VM vm = createVm();
- AddVmFromTemplateCommand<VmManagementParametersBase> cmd =
createVmFromTemplateCommand(vm);
+ AddVmFromTemplateCommand<AddVmParameters> cmd =
createVmFromTemplateCommand(vm);
mockStorageDomainDAOGetForStoragePool();
mockVdsGroupDAOReturnVdsGroup();
@@ -163,7 +164,7 @@
ArrayList<String> reasons = new ArrayList<String>();
final int domainSizeGB = 20;
final int sizeRequired = 5;
- AddVmCommand<VmManagementParametersBase> cmd =
setupCanAddVmTests(domainSizeGB, sizeRequired);
+ AddVmCommand<AddVmParameters> cmd = setupCanAddVmTests(domainSizeGB,
sizeRequired);
doReturn(Collections.emptyList()).when(cmd).validateCustomProperties(any(VmStatic.class));
doReturn(true).when(cmd).validateSpaceRequirements();
assertTrue("vm could not be added", cmd.canAddVm(reasons,
Arrays.asList(createStorageDomain(domainSizeGB))));
@@ -207,7 +208,7 @@
@Test
public void canAddVmWithVirtioScsiControllerNotSupportedOs() {
VM vm = createVm();
- AddVmFromTemplateCommand<VmManagementParametersBase> cmd =
createVmFromTemplateCommand(vm);
+ AddVmFromTemplateCommand<AddVmParameters> cmd =
createVmFromTemplateCommand(vm);
VDSGroup vdsGroup = createVdsGroup();
@@ -235,7 +236,7 @@
@Test
public void isVirtioScsiEnabledDefaultedToTrue() {
- AddVmCommand<VmManagementParametersBase> cmd = setupCanAddVmTests(0,
0);
+ AddVmCommand<AddVmParameters> cmd = setupCanAddVmTests(0, 0);
doReturn(createVdsGroup()).when(cmd).getVdsGroup();
when(osRepository.getDiskInterfaces(any(Integer.class),
any(Version.class))).thenReturn(
new ArrayList<>(Arrays.asList("VirtIO_SCSI")));
@@ -244,7 +245,7 @@
@Test
public void validateSpaceAndThreshold() {
- AddVmCommand<VmManagementParametersBase> command =
setupCanAddVmTests(0, 0);
+ AddVmCommand<AddVmParameters> command = setupCanAddVmTests(0, 0);
doReturn(ValidationResult.VALID).when(storageDomainValidator).isDomainWithinThresholds();
doReturn(ValidationResult.VALID).when(storageDomainValidator).hasSpaceForNewDisks(anyList());
doReturn(storageDomainValidator).when(command).createStorageDomainValidator(any(StorageDomain.class));
@@ -255,7 +256,7 @@
@Test
public void validateSpaceNotEnough() throws Exception {
- AddVmCommand<VmManagementParametersBase> command =
setupCanAddVmTests(0, 0);
+ AddVmCommand<AddVmParameters> command = setupCanAddVmTests(0, 0);
doReturn(ValidationResult.VALID).when(storageDomainValidator).isDomainWithinThresholds();
doReturn(new
ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN)).
when(storageDomainValidator).hasSpaceForNewDisks(anyList());
@@ -267,7 +268,7 @@
@Test
public void validateSpaceNotWithinThreshold() throws Exception {
- AddVmCommand<VmManagementParametersBase> command =
setupCanAddVmTests(0, 0);
+ AddVmCommand<AddVmParameters> command = setupCanAddVmTests(0, 0);
doReturn((new
ValidationResult(VdcBllMessages.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN))).
when(storageDomainValidator).isDomainWithinThresholds();
doReturn(storageDomainValidator).when(command).createStorageDomainValidator(any(StorageDomain.class));
@@ -293,11 +294,11 @@
doReturn(MAX_PCI_SLOTS).when(osRepository).getMaxPciDevices(anyInt(),
any(Version.class));
}
- protected AddVmFromTemplateCommand<VmManagementParametersBase>
createVmFromTemplateCommand(VM vm) {
- VmManagementParametersBase param = new VmManagementParametersBase();
+ protected AddVmFromTemplateCommand<AddVmParameters>
createVmFromTemplateCommand(VM vm) {
+ AddVmParameters param = new AddVmParameters();
param.setVm(vm);
- AddVmFromTemplateCommand<VmManagementParametersBase> concrete =
- new
AddVmFromTemplateCommand<VmManagementParametersBase>(param) {
+ AddVmFromTemplateCommand<AddVmParameters> concrete =
+ new AddVmFromTemplateCommand<AddVmParameters>(param) {
@Override
protected void initTemplateDisks() {
// Stub for testing
@@ -313,7 +314,7 @@
return createVmTemplate();
}
};
- AddVmFromTemplateCommand<VmManagementParametersBase> result =
spy(concrete);
+ AddVmFromTemplateCommand<AddVmParameters> result = spy(concrete);
doReturn(true).when(result).checkNumberOfMonitors();
doReturn(createVmTemplate()).when(result).getVmTemplate();
doReturn(Collections.emptyList()).when(result).validateCustomProperties(any(VmStatic.class));
@@ -368,16 +369,16 @@
when(vmDAO.get(Matchers.<Guid>any(Guid.class))).thenReturn(vm);
}
- private AddVmCommand<VmManagementParametersBase> setupCanAddVmTests(final
int domainSizeGB,
+ private AddVmCommand<AddVmParameters> setupCanAddVmTests(final int
domainSizeGB,
final int sizeRequired) {
VM vm = initializeMock(domainSizeGB, sizeRequired);
- AddVmCommand<VmManagementParametersBase> cmd = createCommand(vm);
+ AddVmCommand<AddVmParameters> cmd = createCommand(vm);
initCommandMethods(cmd);
doReturn(createVmTemplate()).when(cmd).getVmTemplate();
return cmd;
}
- private static <T extends VmManagementParametersBase> void
initCommandMethods(AddVmCommand<T> cmd) {
+ private static <T extends AddVmParameters> void
initCommandMethods(AddVmCommand<T> cmd) {
doReturn(Guid.newGuid()).when(cmd).getStoragePoolId();
doReturn(true).when(cmd).canAddVm(anyListOf(String.class),
anyString(), any(Guid.class), anyInt());
doReturn(STORAGE_POOL_ID).when(cmd).getStoragePoolId();
@@ -532,9 +533,9 @@
return vm;
}
- private AddVmCommand<VmManagementParametersBase> createCommand(VM vm) {
- VmManagementParametersBase param = new VmManagementParametersBase(vm);
- AddVmCommand<VmManagementParametersBase> cmd = new
AddVmCommand<VmManagementParametersBase>(param) {
+ private AddVmCommand<AddVmParameters> createCommand(VM vm) {
+ AddVmParameters param = new AddVmParameters(vm);
+ AddVmCommand<AddVmParameters> cmd = new
AddVmCommand<AddVmParameters>(param) {
@Override
protected void initTemplateDisks() {
// Stub for testing
@@ -602,7 +603,7 @@
return disksList;
}
- private void
mockGetAllSnapshots(AddVmFromTemplateCommand<VmManagementParametersBase>
command) {
+ private void mockGetAllSnapshots(AddVmFromTemplateCommand<AddVmParameters>
command) {
doAnswer(new Answer<List<DiskImage>>() {
@Override
public List<DiskImage> answer(InvocationOnMock invocation) throws
Throwable {
@@ -616,7 +617,7 @@
- private <T extends VmManagementParametersBase> void
mockUninterestingMethods(AddVmCommand<T> spy) {
+ private <T extends AddVmParameters> void
mockUninterestingMethods(AddVmCommand<T> spy) {
doReturn(true).when(spy).isVmNameValidLength(Matchers.<VM>
any(VM.class));
doReturn(false).when(spy).isVmWithSameNameExists(anyString());
doReturn(STORAGE_POOL_ID).when(spy).getStoragePoolId();
@@ -636,7 +637,7 @@
@Test
public void testPatternBasedNameFails() {
- AddVmCommand<VmManagementParametersBase> cmd =
createCommand(initializeMock(1, 1));
+ AddVmCommand<AddVmParameters> cmd = createCommand(initializeMock(1,
1));
cmd.getParameters().getVm().setName("aa-??bb");
assertFalse("Pattern-based name should not be supported for VM",
cmd.validateInputs());
}
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 3f3c376..b109a158 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.VmManagementParametersBase;
+import org.ovirt.engine.core.common.action.AddVmParameters;
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<VmManagementParametersBase> command;
+ protected AddVmFromTemplateCommand<AddVmParameters> command;
@Test
public void validateSpaceAndThreshold() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
index 1816009..8de3859 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
@@ -10,7 +10,7 @@
/**
* Parameter class for AddVmFromSnapshot command
*/
-public class AddVmFromSnapshotParameters extends VmManagementParametersBase
implements Serializable {
+public class AddVmFromSnapshotParameters extends AddVmParameters implements
Serializable {
private static final long serialVersionUID = -3400982291165788716L;
//Unique Identifier of Source Snapshot
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
index fef2d8a..4ac74f2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
@@ -3,7 +3,7 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.compat.Guid;
-public class CloneVmParameters extends VmManagementParametersBase {
+public class CloneVmParameters extends AddVmParameters {
private Guid newVmGuid;
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 1a43754..756bc15 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
@@ -310,7 +310,7 @@
}
private Response cloneVmFromTemplate(VmStatic staticVm, VM vm, Guid
templateId) {
- VmManagementParametersBase params = new
VmManagementParametersBase(staticVm);
+ AddVmParameters params = new AddVmParameters(staticVm);
params.setDiskInfoDestinationMap(getDisksToClone(vm.getDisks(),
templateId));
params.setVmPayload(getPayload(vm));
params.setVirtioScsiEnabled(vm.isSetVirtioScsi() &&
vm.getVirtioScsi().isSetEnabled() ?
@@ -374,7 +374,7 @@
}
protected Response addVm(VmStatic staticVm, VM vm, Guid storageDomainId,
Guid templateId) {
- VmManagementParametersBase params = new
VmManagementParametersBase(staticVm);
+ AddVmParameters params = new AddVmParameters(staticVm);
params.setVmPayload(getPayload(vm));
if (vm.isSetMemoryPolicy() && vm.getMemoryPolicy().isSetBallooning()) {
params.setBalloonEnabled(vm.getMemoryPolicy().isBallooning());
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 955e18d..f5652ce 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
@@ -36,7 +36,6 @@
import org.ovirt.engine.core.common.action.ImportVmParameters;
import org.ovirt.engine.core.common.action.RemoveVmParameters;
import org.ovirt.engine.core.common.action.VdcActionType;
-import org.ovirt.engine.core.common.action.VmManagementParametersBase;
import org.ovirt.engine.core.common.businessentities.ArchitectureType;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatus;
import org.ovirt.engine.core.common.businessentities.AsyncTaskStatusEnum;
@@ -523,7 +522,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVmFromTemplate,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
true,
@@ -606,7 +605,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVmFromTemplate,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
true,
@@ -652,7 +651,7 @@
vm.setUseLatestVersion(true);
setUpCreationExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[]{"StorageDomainId"},
new Object[]{GUIDS[0]},
true,
@@ -695,7 +694,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
true,
@@ -924,7 +923,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
true,
@@ -975,7 +974,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[1] },
true,
@@ -1024,7 +1023,7 @@
setUpVDSGroup(GUIDS[2]));
setUpCreationExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
true,
@@ -1083,7 +1082,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId",
"CopyTemplatePermissions" },
new Object[] { GUIDS[0], copy },
true,
@@ -1138,7 +1137,7 @@
getVdsGroupEntity());
setUpCreationExpectations(VdcActionType.AddVmFromTemplate,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId",
"CopyTemplatePermissions" },
new Object[] { GUIDS[0], copy },
true,
@@ -1278,7 +1277,7 @@
new Object[] { GUIDS[2] },
getVdsGroupEntity());
setUriInfo(setUpActionExpectations(VdcActionType.AddVm,
- VmManagementParametersBase.class,
+ AddVmParameters.class,
new String[] { "StorageDomainId" },
new Object[] { GUIDS[0] },
canDo,
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 019f51e..81393df 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
@@ -16,7 +16,6 @@
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
import org.ovirt.engine.core.common.action.VdcActionType;
import org.ovirt.engine.core.common.action.VmManagementParametersBase;
-import org.ovirt.engine.core.common.businessentities.DiskImage;
import org.ovirt.engine.core.common.businessentities.DisplayType;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
import org.ovirt.engine.core.common.businessentities.StoragePool;
@@ -1118,7 +1117,7 @@
VM vm = gettempVm();
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName()));
- VmManagementParametersBase param = new
VmManagementParametersBase(vm);
+ AddVmParameters param = new AddVmParameters(vm);
param.setDiskInfoDestinationMap(unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap());
param.setMakeCreatorExplicitOwner(true);
param.setCopyTemplatePermissions(unitVmModel.getCopyPermissions().getEntity());
@@ -1136,7 +1135,7 @@
VM vm = gettempVm();
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName()));
- VmManagementParametersBase param = new
VmManagementParametersBase(vm);
+ AddVmParameters param = new AddVmParameters(vm);
param.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap());
param.setMakeCreatorExplicitOwner(true);
param.setCopyTemplatePermissions(model.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 ebb3299..1643aea 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
@@ -2197,7 +2197,7 @@
VM vm = vmListModel.getcurrentVm();
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName()));
- VmManagementParametersBase param = new
VmManagementParametersBase(vm);
+ AddVmParameters param = new AddVmParameters(vm);
param.setDiskInfoDestinationMap(unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap());
param.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity());
param.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity());
@@ -2223,7 +2223,7 @@
VM vm = getcurrentVm();
vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName()));
- VmManagementParametersBase params = new
VmManagementParametersBase(vm);
+ AddVmParameters params = new AddVmParameters(vm);
params.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap());
params.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity());
params.setBalloonEnabled(balloonEnabled(model));
--
To view, visit http://gerrit.ovirt.org/32642
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I64943e1538c6c796ab0cdf4da71ca820ff63b0ee
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <aha...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
