Arik Hadas has uploaded a new change for review. Change subject: webadmin: do not use AddVmFromScratch ......................................................................
webadmin: do not use AddVmFromScratch The UI doesn't provide disks to the AddVmFromScratch command so it should use AddVm instead. Change-Id: Ib24456a1bc8edd3dc505c39f067fe798aa6810ae Signed-off-by: Arik Hadas <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java 1 file changed, 43 insertions(+), 97 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/33143/1 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..ca668d9 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,6 @@ import java.util.Map.Entry; import org.ovirt.engine.core.common.VdcActionUtils; -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; @@ -2124,55 +2123,40 @@ } private void saveNewVm(final UnitVmModel model) { - if (getcurrentVm().getVmtGuid().equals(Guid.Empty)) + if (model.getProgress() != null) { - if (model.getProgress() != null) - { - return; - } + return; + } - VmInterfaceCreatingManager addVmFromScratchNetworkManager = - new VmInterfaceCreatingManager(new VmInterfaceCreatingManager.PostVnicCreatedCallback() { - @Override - public void vnicCreated(Guid vmId) { - // do nothing - } - - @Override - public void queryFailed() { - // do nothing - } - }); - + if (model.getProvisioning().getEntity()) + { model.startProgress(null); - AddVmParameters parameters = new AddVmParameters(getcurrentVm()); - parameters.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); - parameters.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity()); - parameters.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity()); - parameters.setBalloonEnabled(balloonEnabled(model)); - - setVmWatchdogToParams(model, parameters); - setRngDeviceToParams(model, parameters); - - Frontend.getInstance().runAction(VdcActionType.AddVmFromScratch, - parameters, - new UnitVmModelNetworkAsyncCallback(model, addVmFromScratchNetworkManager) { + AsyncQuery _asyncQuery = new AsyncQuery(); + _asyncQuery.setModel(this); + _asyncQuery.asyncCallback = new INewAsyncCallback() { @Override - public void executed(FrontendActionAsyncResult result) { - getWindow().stopProgress(); - VdcReturnValueBase returnValue = result.getReturnValue(); - if (returnValue != null && returnValue.getSucceeded()) { - setWindow(null); - setGuideContext(returnValue.getActionReturnValue()); - updateActionAvailability(); - getGuideCommand().execute(); - } else { - cancel(); - } - super.executed(result); + public void onSuccess(Object model1, Object result1) + { + VmListModel vmListModel = (VmListModel) model1; + UnitVmModel unitVmModel = (UnitVmModel) vmListModel.getWindow(); + + VM vm = vmListModel.getcurrentVm(); + vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName())); + + 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()); + param.setBalloonEnabled(balloonEnabled(model)); + param.setCopyTemplatePermissions(model.getCopyPermissions().getEntity()); + setRngDeviceToParams(model, param); + + Frontend.getInstance().runAction(VdcActionType.AddVmFromTemplate, param, new UnitVmModelNetworkAsyncCallback(model, defaultNetworkCreatingManager), vmListModel); } - }, this); + }; + AsyncDataProvider.getInstance().getTemplateDiskList(_asyncQuery, getcurrentVm().getVmtGuid()); } else { @@ -2181,63 +2165,25 @@ return; } - if (model.getProvisioning().getEntity()) - { - model.startProgress(null); + model.startProgress(null); - AsyncQuery _asyncQuery = new AsyncQuery(); - _asyncQuery.setModel(this); - _asyncQuery.asyncCallback = new INewAsyncCallback() { - @Override - public void onSuccess(Object model1, Object result1) - { - VmListModel vmListModel = (VmListModel) model1; - UnitVmModel unitVmModel = (UnitVmModel) vmListModel.getWindow(); + VM vm = getcurrentVm(); + vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName())); - VM vm = vmListModel.getcurrentVm(); - vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(unitVmModel.getTemplate().getSelectedItem().getTemplateVersionName())); + VmManagementParametersBase params = new VmManagementParametersBase(vm); + params.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap()); + params.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity()); + params.setBalloonEnabled(balloonEnabled(model)); + params.setCopyTemplatePermissions(model.getCopyPermissions().getEntity()); - 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()); - param.setBalloonEnabled(balloonEnabled(model)); - param.setCopyTemplatePermissions(model.getCopyPermissions().getEntity()); - setRngDeviceToParams(model, param); + ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); + parameters.add(params); + params.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); + params.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity()); + setVmWatchdogToParams(model, params); + setRngDeviceToParams(model, params); - Frontend.getInstance().runAction(VdcActionType.AddVmFromTemplate, param, new UnitVmModelNetworkAsyncCallback(model, defaultNetworkCreatingManager), vmListModel); - } - }; - AsyncDataProvider.getInstance().getTemplateDiskList(_asyncQuery, getcurrentVm().getVmtGuid()); - } - else - { - if (model.getProgress() != null) - { - return; - } - - model.startProgress(null); - - VM vm = getcurrentVm(); - vm.setUseLatestVersion(constants.latestTemplateVersionName().equals(model.getTemplate().getSelectedItem().getTemplateVersionName())); - - VmManagementParametersBase params = new VmManagementParametersBase(vm); - params.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap()); - params.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity()); - params.setBalloonEnabled(balloonEnabled(model)); - params.setCopyTemplatePermissions(model.getCopyPermissions().getEntity()); - - ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); - parameters.add(params); - params.setSoundDeviceEnabled(model.getIsSoundcardEnabled().getEntity()); - params.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity()); - setVmWatchdogToParams(model, params); - setRngDeviceToParams(model, params); - - Frontend.getInstance().runAction(VdcActionType.AddVm, params, new UnitVmModelNetworkAsyncCallback(model, defaultNetworkCreatingManager), this); - } + Frontend.getInstance().runAction(VdcActionType.AddVm, params, new UnitVmModelNetworkAsyncCallback(model, defaultNetworkCreatingManager), this); } } -- To view, visit http://gerrit.ovirt.org/33143 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib24456a1bc8edd3dc505c39f067fe798aa6810ae 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
