Tomas Jelinek has uploaded a new change for review. Change subject: userportal,webadmin: some params on make template ignored ......................................................................
userportal,webadmin: some params on make template ignored The make template ignored some parameters. - In UserPortal the usb policy has been taken from an incorrect place - In both UserPortal and WebAdmin the Boot Options -> Attach CD was ignored - In engine the allow console reconnect and iso path has been ignored in new template Change-Id: Ibf4c0610688ae773e86190d4bd2d73cd7c74b1e6 bug-url: https://bugzilla.redhat.com/952712 Signed-off-by: Tomas Jelinek <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.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/NewTemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 5 files changed, 26 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/15344/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java index 8a8a63e..94e673a 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java @@ -369,6 +369,8 @@ getVmTemplate().setQuotaId(getParameters().getMasterVm().getQuotaId()); getVmTemplate().setDedicatedVmForVds(getParameters().getMasterVm().getDedicatedVmForVds()); getVmTemplate().setMigrationSupport(getParameters().getMasterVm().getMigrationSupport()); + getVmTemplate().setAllowConsoleReconnect(getParameters().getMasterVm().isAllowConsoleReconnect()); + getVmTemplate().setIsoPath(getParameters().getMasterVm().getIsoPath()); DbFacade.getInstance().getVmTemplateDao().save(getVmTemplate()); getCompensationContext().snapshotNewEntity(getVmTemplate()); setActionReturnValue(getVmTemplate().getId()); 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 69ffe91..a2ee542 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 @@ -623,7 +623,6 @@ tempVar.setCpuPerSocket(Integer.parseInt(model.getTotalCPUCores().getEntity().toString()) / (Integer) model.getNumOfSockets().getSelectedItem()); tempVar.setDeleteProtected((Boolean) model.getIsDeleteProtected().getEntity()); - tempVar.setUsbPolicy((UsbPolicy) model.getUsbPolicy().getSelectedItem()); tempVar.setAutoSuspend(false); tempVar.setStateless((Boolean) model.getIsStateless().getEntity()); tempVar.setRunAndPause(((Boolean) model.getIsRunAndPause().getEntity())); @@ -631,6 +630,7 @@ tempVar.setDefaultBootSequence(model.getBootSequence()); tempVar.setAutoStartup((Boolean) model.getIsHighlyAvailable().getEntity()); tempVar.setIsoPath(model.getCdImage().getIsChangable() ? (String) model.getCdImage().getSelectedItem() : ""); //$NON-NLS-1$ + tempVar.setUsbPolicy(vm.getUsbPolicy()); tempVar.setInitrdUrl(vm.getInitrdUrl()); tempVar.setKernelUrl(vm.getKernelUrl()); tempVar.setKernelParams(vm.getKernelParams()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java index 6fb238f..45c6b42 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java @@ -202,6 +202,8 @@ getModel().getIsSmartcardEnabled().setEntity(this.vm.isSmartcardEnabled()); getModel().getVncKeyboardLayout().setSelectedItem(this.vm.getVncKeyboardLayout()); + updateSelectedCdImage(this.vm.getStaticData()); + updateTimeZone(this.vm.getTimeZone()); // Update domain list diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java index 6e55a9c..ebb8e71 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java @@ -1,5 +1,9 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StoragePool; @@ -9,16 +13,11 @@ import org.ovirt.engine.core.common.businessentities.VmWatchdog; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.compat.NGuid; -import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; public class TemplateVmModelBehavior extends VmModelBehaviorBase { @@ -47,7 +46,7 @@ UnitVmModel model = (UnitVmModel) target; StoragePool dataCenter = (StoragePool) returnValue; model.setDataCenter(model, - new ArrayList<StoragePool>(Arrays.asList(new StoragePool[] { dataCenter }))); + new ArrayList<StoragePool>(Arrays.asList(new StoragePool[]{dataCenter}))); model.getDataCenter().setIsChangable(false); } @@ -63,7 +62,7 @@ @SuppressWarnings("unchecked") Collection<VmWatchdog> watchdogs = (Collection<VmWatchdog>) ((VdcQueryReturnValue) returnValue).getReturnValue(); - for(VmWatchdog watchdog: watchdogs) { + for (VmWatchdog watchdog : watchdogs) { model.getWatchdogAction().setSelectedItem(watchdog.getAction().name().toLowerCase()); model.getWatchdogModel().setSelectedItem(watchdog.getModel().name()); } @@ -201,12 +200,9 @@ private void initCdImage() { - getModel().getCdImage().setSelectedItem(template.getIsoPath()); - - boolean hasCd = !StringHelper.isNullOrEmpty(template.getIsoPath()); - getModel().getCdImage().setIsChangable(hasCd); - getModel().getCdAttached().setEntity(hasCd); + updateSelectedCdImage(template); updateCdImage(); } + } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 8a45738..467fa10 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -1,5 +1,9 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import org.ovirt.engine.core.common.TimeZoneType; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.Disk; @@ -12,6 +16,7 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VolumeType; @@ -34,11 +39,6 @@ import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType; import org.ovirt.engine.ui.uicompat.Constants; import org.ovirt.engine.ui.uicompat.ConstantsManager; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; public abstract class VmModelBehaviorBase<TModel extends UnitVmModel> { @@ -860,4 +860,12 @@ protected void updateHostPinning(MigrationSupport migrationSupport) { getModel().getMigrationMode().setSelectedItem(migrationSupport); } + + protected void updateSelectedCdImage(VmBase vmBase) { + getModel().getCdImage().setSelectedItem(vmBase.getIsoPath()); + + boolean hasCd = !StringHelper.isNullOrEmpty(vmBase.getIsoPath()); + getModel().getCdImage().setIsChangable(hasCd); + getModel().getCdAttached().setEntity(hasCd); + } } -- To view, visit http://gerrit.ovirt.org/15344 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf4c0610688ae773e86190d4bd2d73cd7c74b1e6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
