Arik Hadas has uploaded a new change for review. Change subject: core: cleanup AddVmParameters constructors ......................................................................
core: cleanup AddVmParameters constructors In order to generalize AddVmParameters for AddVmCommand + AddVmFromTemplate + AddVmFromScratch, the list of disks and storage domain ID are removed from the arguments lists of the constructors. Those values can be set by using the setter methods when needed. Change-Id: I06f2de3db1b0559af4df04d0d158b10b8460c684 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/VdsEventListener.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmAndAttachToPoolParameters.java M 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 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 7 files changed, 16 insertions(+), 22 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/32641/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 650f70c..3655617 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 @@ -56,8 +56,9 @@ } private VdcReturnValueBase addVmFromScratch(VmStatic vmStatic) { - AddVmParameters parameters = new AddVmParameters(vmStatic, getParameters() - .getDiskInfoList(), getParameters().getStorageDomainId()); + AddVmParameters parameters = new AddVmParameters(vmStatic); + parameters.setDiskInfoList(getParameters().getDiskInfoList()); + parameters.setStorageDomainId(getParameters().getStorageDomainId()); parameters.setSessionId(getParameters().getSessionId()); parameters.setDontAttachToDefaultTag(true); return runInternalActionWithTasksContext(VdcActionType.AddVmFromScratch, parameters); 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 49f94c9..d3dad3e 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 @@ -416,7 +416,7 @@ @Override public void addExternallyManagedVms(List<VmStatic> externalVmList) { for (VmStatic currVm : externalVmList) { - AddVmParameters params = new AddVmParameters(currVm, null, null); + AddVmParameters params = new AddVmParameters(currVm); 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 91cfb5c..b17d842 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 @@ -18,8 +18,9 @@ } public AddVmAndAttachToPoolParameters(VmStatic currVm, Guid poolId, String currentVmName, Guid storageDomainId) { - super(currVm, new ArrayList<DiskImage>( - Arrays.asList(new DiskImage())), storageDomainId); + super(currVm); + setDiskInfoList(new ArrayList<DiskImage>(Arrays.asList(new DiskImage()))); + setStorageDomainId(storageDomainId); this.poolId = poolId; this.currentVmName = currentVmName; } @@ -28,8 +29,8 @@ Guid poolId, String currentVmName, HashMap<Guid, DiskImage> diskInfoDestinationMap) { - super(currVm, new ArrayList<DiskImage>( - Arrays.asList(new DiskImage())), Guid.Empty); + super(currVm); + setDiskInfoList(new ArrayList<DiskImage>(Arrays.asList(new DiskImage()))); this.poolId = poolId; this.currentVmName = currentVmName; setDiskInfoDestinationMap(diskInfoDestinationMap); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java index 882d7dd..ad777a6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmParameters.java @@ -5,7 +5,6 @@ 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 AddVmParameters extends VmManagementParametersBase { private static final long serialVersionUID = 8641610721114989096L; @@ -15,15 +14,12 @@ public AddVmParameters() { } - public AddVmParameters(VmStatic vmStatic, ArrayList<DiskImage> diskInfoList, - Guid storageDomainId) { + public AddVmParameters(VmStatic vmStatic) { super(vmStatic); - setDiskInfoList((diskInfoList != null) ? diskInfoList : new ArrayList<DiskImage>()); - setStorageDomainId(storageDomainId); } - public AddVmParameters(VM vm, ArrayList<DiskImage> diskInfoList, Guid storageDomainId) { - this(vm.getStaticData(), diskInfoList, storageDomainId); + public AddVmParameters(VM vm) { + this(vm.getStaticData()); } public ArrayList<DiskImage> getDiskInfoList() { 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 425a932..1a43754 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 @@ -413,7 +413,8 @@ } protected Response addVmFromScratch(VmStatic staticVm, VM vm, Guid storageDomainId) { - AddVmParameters params = new AddVmParameters(staticVm, mapDisks(vm.getDisks()), Guid.Empty); + AddVmParameters params = new AddVmParameters(staticVm); + params.setDiskInfoList(mapDisks(vm.getDisks())); params.setVmPayload(getPayload(vm)); if (vm.isSetMemoryPolicy() && vm.getMemoryPolicy().isSetBallooning()) { params.setBalloonEnabled(vm.getMemoryPolicy().isBallooning()); 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 eb629d9..019f51e 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 @@ -1093,10 +1093,7 @@ { if (gettempVm().getVmtGuid().equals(Guid.Empty)) { - AddVmParameters parameters = - new AddVmParameters(gettempVm(), - new ArrayList<DiskImage>(), - Guid.Empty); + AddVmParameters parameters = new AddVmParameters(gettempVm()); parameters.setMakeCreatorExplicitOwner(true); parameters.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); parameters.setConsoleEnabled(model.getIsConsoleDeviceEnabled().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 abdbe5f..ebb3299 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 @@ -2146,9 +2146,7 @@ model.startProgress(null); - AddVmParameters parameters = new AddVmParameters(getcurrentVm(), - new ArrayList<DiskImage>(), - Guid.Empty); + AddVmParameters parameters = new AddVmParameters(getcurrentVm()); parameters.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); parameters.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity()); parameters.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity()); -- To view, visit http://gerrit.ovirt.org/32641 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06f2de3db1b0559af4df04d0d158b10b8460c684 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
