Arik Hadas has uploaded a new change for review. Change subject: core: introduce AddVmParameters ......................................................................
core: introduce AddVmParameters As a step in the way for having one parameters class for AddVmCommand + AddVmFromTemplate + AddVmFromScratch, AddVmFromScratchParameters is renamed to AddVmParameters. Change-Id: Ia5b2f28897c6017a38e30db88918af6225e1cb3d Signed-off-by: Arik Hadas <[email protected]> --- 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/AddVmFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmAndAttachToPoolParameters.java R backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.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 9 files changed, 25 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/32640/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 3e42db2..650f70c 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 @@ -1,12 +1,11 @@ package org.ovirt.engine.core.bll; -import org.ovirt.engine.core.bll.context.CommandContext; - import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.common.action.AddVmAndAttachToPoolParameters; -import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; +import org.ovirt.engine.core.common.action.AddVmParameters; import org.ovirt.engine.core.common.action.AddVmToPoolParameters; import org.ovirt.engine.core.common.action.LockProperties; import org.ovirt.engine.core.common.action.VdcActionType; @@ -57,7 +56,7 @@ } private VdcReturnValueBase addVmFromScratch(VmStatic vmStatic) { - AddVmFromScratchParameters parameters = new AddVmFromScratchParameters(vmStatic, getParameters() + AddVmParameters parameters = new AddVmParameters(vmStatic, getParameters() .getDiskInfoList(), getParameters().getStorageDomainId()); parameters.setSessionId(getParameters().getSessionId()); parameters.setDontAttachToDefaultTag(true); 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 99f0273..f5771e1 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 @@ -8,7 +8,7 @@ import org.ovirt.engine.core.bll.utils.PermissionSubject; import org.ovirt.engine.core.common.VdcObjectType; import org.ovirt.engine.core.common.action.AddImageFromScratchParameters; -import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; +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.VdcActionType; @@ -31,7 +31,7 @@ */ @DisableInPrepareMode @NonTransactiveCommandAttribute -public class AddVmFromScratchCommand<T extends AddVmFromScratchParameters> extends AddVmCommand<T> { +public class AddVmFromScratchCommand<T extends AddVmParameters> extends AddVmCommand<T> { public AddVmFromScratchCommand(T parameters) { super(parameters, null); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java index e404a25..49f94c9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java @@ -22,7 +22,7 @@ import org.ovirt.engine.core.bll.storage.StoragePoolStatusHandler; import org.ovirt.engine.core.bll.tasks.CommandCoordinatorUtil; import org.ovirt.engine.core.common.AuditLogType; -import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; +import org.ovirt.engine.core.common.action.AddVmParameters; import org.ovirt.engine.core.common.action.ConnectHostToStoragePoolServersParameters; import org.ovirt.engine.core.common.action.FenceVdsActionParameters; import org.ovirt.engine.core.common.action.HostStoragePoolParametersBase; @@ -416,7 +416,7 @@ @Override public void addExternallyManagedVms(List<VmStatic> externalVmList) { for (VmStatic currVm : externalVmList) { - AddVmFromScratchParameters params = new AddVmFromScratchParameters(currVm, null, null); + AddVmParameters params = new AddVmParameters(currVm, null, null); VdcReturnValueBase returnValue = Backend.getInstance().runInternalAction(VdcActionType.AddVmFromScratch, params, ExecutionHandler.createInternalJobContext()); if (!returnValue.getSucceeded()) { log.debugFormat("Failed adding Externally managed VM {0}", currVm.getName()); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmAndAttachToPoolParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmAndAttachToPoolParameters.java index 3c9325a..91cfb5c 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmAndAttachToPoolParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmAndAttachToPoolParameters.java @@ -8,7 +8,7 @@ import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.compat.Guid; -public class AddVmAndAttachToPoolParameters extends AddVmFromScratchParameters { +public class AddVmAndAttachToPoolParameters extends AddVmParameters { private static final long serialVersionUID = -2676528333942591702L; private Guid poolId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromScratchParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java similarity index 75% rename from backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromScratchParameters.java rename to backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java index c2173aa..882d7dd 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromScratchParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java @@ -7,22 +7,22 @@ import org.ovirt.engine.core.common.businessentities.VmStatic; import org.ovirt.engine.core.compat.Guid; -public class AddVmFromScratchParameters extends VmManagementParametersBase { +public class AddVmParameters extends VmManagementParametersBase { private static final long serialVersionUID = 8641610721114989096L; private ArrayList<DiskImage> diskInfoList; - public AddVmFromScratchParameters() { + public AddVmParameters() { } - public AddVmFromScratchParameters(VmStatic vmStatic, ArrayList<DiskImage> diskInfoList, + public AddVmParameters(VmStatic vmStatic, ArrayList<DiskImage> diskInfoList, Guid storageDomainId) { super(vmStatic); setDiskInfoList((diskInfoList != null) ? diskInfoList : new ArrayList<DiskImage>()); setStorageDomainId(storageDomainId); } - public AddVmFromScratchParameters(VM vm, ArrayList<DiskImage> diskInfoList, Guid storageDomainId) { + public AddVmParameters(VM vm, ArrayList<DiskImage> diskInfoList, Guid storageDomainId) { this(vm.getStaticData(), diskInfoList, 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 e2c197a..425a932 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 @@ -38,8 +38,8 @@ import org.ovirt.engine.api.restapi.types.RngDeviceMapper; import org.ovirt.engine.api.restapi.types.VmMapper; 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.AddVmParameters; import org.ovirt.engine.core.common.action.ImportVmParameters; import org.ovirt.engine.core.common.action.RemoveVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -413,7 +413,7 @@ } protected Response addVmFromScratch(VmStatic staticVm, VM vm, Guid storageDomainId) { - AddVmFromScratchParameters params = new AddVmFromScratchParameters(staticVm, mapDisks(vm.getDisks()), Guid.Empty); + AddVmParameters params = new AddVmParameters(staticVm, mapDisks(vm.getDisks()), Guid.Empty); 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 ce5ee2e..955e18d 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 @@ -31,8 +31,8 @@ import org.ovirt.engine.api.restapi.types.DiskMapper; import org.ovirt.engine.api.restapi.util.VmHelper; 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.AddVmParameters; import org.ovirt.engine.core.common.action.ImportVmParameters; import org.ovirt.engine.core.common.action.RemoveVmParameters; import org.ovirt.engine.core.common.action.VdcActionType; @@ -256,7 +256,7 @@ new Object[] { GUIDS[0] }, getTemplateEntity(0)); setUpCreationExpectations(VdcActionType.AddVmFromScratch, - AddVmFromScratchParameters.class, + AddVmParameters.class, new String[] { "StorageDomainId"}, new Object[] { Guid.Empty}, true, @@ -315,7 +315,7 @@ Disks disks = new Disks(); disks.getDisks().add(new Disk()); setUpCreationExpectations(VdcActionType.AddVmFromScratch, - AddVmFromScratchParameters.class, + AddVmParameters.class, new String[] { "StorageDomainId", "DiskInfoList" }, new Object[] { Guid.Empty, mapDisks(disks) }, true, @@ -370,7 +370,7 @@ new Object[] { GUIDS[0] }, getTemplateEntity(0)); setUpCreationExpectations(VdcActionType.AddVmFromScratch, - AddVmFromScratchParameters.class, + AddVmParameters.class, new String[] { "StorageDomainId" }, new Object[] { GUIDS[1] }, true, @@ -432,7 +432,7 @@ getTemplateEntity(0)); setUpCreationExpectations(VdcActionType.AddVmFromScratch, - AddVmFromScratchParameters.class, + AddVmParameters.class, new String[] { "StorageDomainId" }, new Object[] { Guid.Empty }, true, @@ -480,7 +480,7 @@ new Object[] { GUIDS[1] }, getVdsGroupEntity()); setUriInfo(setUpActionExpectations(VdcActionType.AddVmFromScratch, - AddVmFromScratchParameters.class, + AddVmParameters.class, new String[] { "StorageDomainId" }, new Object[] { Guid.Empty }, 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 17e91b7..eb629d9 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 @@ -8,7 +8,7 @@ import java.util.List; import org.ovirt.engine.core.common.VdcActionUtils; -import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; +import org.ovirt.engine.core.common.action.AddVmParameters; import org.ovirt.engine.core.common.action.AddVmTemplateParameters; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.action.ChangeVMClusterParameters; @@ -1093,8 +1093,8 @@ { if (gettempVm().getVmtGuid().equals(Guid.Empty)) { - AddVmFromScratchParameters parameters = - new AddVmFromScratchParameters(gettempVm(), + AddVmParameters parameters = + new AddVmParameters(gettempVm(), new ArrayList<DiskImage>(), Guid.Empty); parameters.setMakeCreatorExplicitOwner(true); 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 6e75925..abdbe5f 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 @@ -9,7 +9,7 @@ import java.util.Map.Entry; import org.ovirt.engine.core.common.VdcActionUtils; -import org.ovirt.engine.core.common.action.AddVmFromScratchParameters; +import org.ovirt.engine.core.common.action.AddVmParameters; import org.ovirt.engine.core.common.action.AddVmTemplateParameters; import org.ovirt.engine.core.common.action.AttachEntityToTagParameters; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; @@ -2146,7 +2146,7 @@ model.startProgress(null); - AddVmFromScratchParameters parameters = new AddVmFromScratchParameters(getcurrentVm(), + AddVmParameters parameters = new AddVmParameters(getcurrentVm(), new ArrayList<DiskImage>(), Guid.Empty); parameters.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); -- To view, visit http://gerrit.ovirt.org/32640 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5b2f28897c6017a38e30db88918af6225e1cb3d 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
