Frank Kobzik has uploaded a new change for review. Change subject: Revert "frontend: Make adding (virtio-)console to virtual machines optional" ......................................................................
Revert "frontend: Make adding (virtio-)console to virtual machines optional" This reverts commit 7b7493db90debd34c7b2e89f94f5a162311085aa. Change-Id: I8964206acec22e901370ab45665546d2602493cd Signed-off-by: Frantisek Kobzik <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.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/ExistingVmModelBehavior.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/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.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/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java 15 files changed, 7 insertions(+), 131 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/15595/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 29c903f..f3669d7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -343,14 +343,11 @@ @DefaultStringValue("Start in Pause Mode") String runAndPauseVmPopup(); - @DefaultStringValue("Delete Protection") + @DefaultStringValue("Delete protection") String deleteProtectionPopup(); - @DefaultStringValue("Smartcard Enabled") + @DefaultStringValue("Smartcard enabled") String smartcardVmPopup(); - - @DefaultStringValue("Console Device Enabled") - String consoleDeviceEnabled(); @DefaultStringValue("Pool") String poolVmPopup(); @@ -1271,5 +1268,4 @@ @DefaultStringValue("Are you sure you want to remove the following items?") String removeConfirmationPopupMessage(); - } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index c878bea..52f380f 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -175,11 +175,6 @@ @WithElementId("isDeleteProtected") public EntityModelCheckBoxEditor isDeleteProtectedEditor; - @UiField(provided = true) - @Path(value = "isConsoleDeviceEnabled.entity") - @WithElementId("isConsoleDeviceEnabled") - public EntityModelCheckBoxEditor isConsoleDeviceEnabledEditor; - @UiField @Ignore Label generalWarningMessage; @@ -541,7 +536,6 @@ isRunAndPauseEditor = new EntityModelCheckBoxEditor(Align.RIGHT); isDeleteProtectedEditor = new EntityModelCheckBoxEditor(Align.RIGHT); isSmartcardEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT); - isConsoleDeviceEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT); cdAttachedEditor = new EntityModelCheckBoxEditor(Align.LEFT); allowConsoleReconnectEditor = new EntityModelCheckBoxEditor(Align.RIGHT); @@ -788,7 +782,6 @@ isStatelessEditor.setLabel(constants.statelessVmPopup()); isRunAndPauseEditor.setLabel(constants.runAndPauseVmPopup()); isDeleteProtectedEditor.setLabel(constants.deleteProtectionPopup()); - isConsoleDeviceEnabledEditor.setLabel(constants.consoleDeviceEnabled()); isSmartcardEnabledEditor.setLabel(constants.smartcardVmPopup()); // Pools Tab @@ -1166,7 +1159,6 @@ isStatelessEditor.setTabIndex(nextTabIndex++); isRunAndPauseEditor.setTabIndex(nextTabIndex++); isDeleteProtectedEditor.setTabIndex(nextTabIndex++); - isConsoleDeviceEnabledEditor.setTabIndex(nextTabIndex++); // == Pools == nextTabIndex = poolTab.setTabIndexes(nextTabIndex); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index 3e8867b..70e0097 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -296,7 +296,6 @@ <e:EntityModelCheckBoxEditor ui:field="isStatelessEditor" addStyleNames="{style.checkbox}" /> <e:EntityModelCheckBoxEditor ui:field="isRunAndPauseEditor" addStyleNames="{style.checkbox}" /> <e:EntityModelCheckBoxEditor ui:field="isDeleteProtectedEditor" addStyleNames="{style.checkbox}" /> - <e:EntityModelCheckBoxEditor ui:field="isConsoleDeviceEnabledEditor" addStyleNames="{style.checkbox}" /> </g:FlowPanel> <g:FlowPanel addStyleNames="{style.sectionPanel}"> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java index bf351a9..fc12827 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java @@ -510,7 +510,6 @@ param.setStorageDomainId(Guid.Empty); param.setDiskInfoDestinationMap(model.getDisksAllocationModel() .getImageToDestinationDomainMap()); - param.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); if (model.getQuota().getSelectedItem() != null) { desktop.setQuotaId(((Quota) model.getQuota().getSelectedItem()).getId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index 4971a17..52cc0cc 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -489,7 +489,6 @@ model.startProgress(null); UpdateVmTemplateParameters parameters = new UpdateVmTemplateParameters(template); - parameters.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); setVmWatchdogToParams(model, parameters); Frontend.RunAction(VdcActionType.UpdateVmTemplate, parameters, 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 9d61a4f..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 @@ -656,7 +656,6 @@ addVmTemplateParameters.setDiskInfoDestinationMap(model.getDisksAllocationModel() .getImageToDestinationDomainMap()); - addVmTemplateParameters.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); Frontend.RunAction(VdcActionType.AddVmTemplate, addVmTemplateParameters, new IFrontendActionAsyncCallback() { @@ -1077,7 +1076,6 @@ new ArrayList<DiskImage>(), NGuid.Empty); parameters.setMakeCreatorExplicitOwner(true); - parameters.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); Frontend.RunAction(VdcActionType.AddVmFromScratch, parameters, new IFrontendActionAsyncCallback() { @@ -1107,7 +1105,6 @@ unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(), Guid.Empty); param.setMakeCreatorExplicitOwner(true); - param.setConsoleEnabled((Boolean) unitVmModel.getIsConsoleDeviceEnabled().getEntity()); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(param); @@ -1130,7 +1127,6 @@ VmManagementParametersBase param = new VmManagementParametersBase(gettempVm()); param.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap()); param.setMakeCreatorExplicitOwner(true); - param.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(param); @@ -1171,10 +1167,7 @@ } else { - VmManagementParametersBase params = new VmManagementParametersBase(gettempVm()); - params.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); - - Frontend.RunAction(VdcActionType.UpdateVm, params, + Frontend.RunAction(VdcActionType.UpdateVm, new VmManagementParametersBase(gettempVm()), new IFrontendActionAsyncCallback() { @Override public void executed(FrontendActionAsyncResult a) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java index 1d8e5d6..591c715 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java @@ -7,10 +7,10 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VmWatchdog; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -190,13 +190,6 @@ } })); - Frontend.RunQuery(VdcQueryType.GetConsoleDevices, new IdQueryParameters(getVm().getId()), new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue) { - List<String> consoleDevices = (List<String>) ((VdcQueryReturnValue)returnValue).getReturnValue(); - getModel().getIsConsoleDeviceEnabled().setEntity(!consoleDevices.isEmpty()); - } - })); getModel().getVncKeyboardLayout().setSelectedItem(vm.getVncKeyboardLayout()); 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 1b65d28..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 @@ -3,7 +3,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.List; import org.ovirt.engine.core.common.businessentities.ActionGroup; import org.ovirt.engine.core.common.businessentities.Disk; @@ -18,13 +17,8 @@ import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VM; -import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VolumeType; -import org.ovirt.engine.core.common.queries.IdQueryParameters; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.ui.frontend.AsyncQuery; -import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -185,15 +179,6 @@ } @Override - public void oSType_SelectedItemChanged() { - if (getModel().getOSType().getSelectedItem() == null) { - return; - } - - getModel().getIsConsoleDeviceEnabled().setEntity(((VmOsType) getModel().getOSType().getSelectedItem()).isLinux()); - } - - @Override public void updateMinAllocatedMemory() { } @@ -220,14 +205,6 @@ updateSelectedCdImage(this.vm.getStaticData()); updateTimeZone(this.vm.getTimeZone()); - - Frontend.RunQuery(VdcQueryType.GetConsoleDevices, new IdQueryParameters(this.vm.getId()), new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue) { - List<String> consoleDevices = (List<String>) ((VdcQueryReturnValue)returnValue).getReturnValue(); - getModel().getIsConsoleDeviceEnabled().setEntity(!consoleDevices.isEmpty()); - } - })); // Update domain list updateDomain(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index 644083b..1d0f6a7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -1,7 +1,6 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; import java.util.ArrayList; -import java.util.List; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; @@ -10,16 +9,11 @@ import org.ovirt.engine.core.common.businessentities.StoragePoolStatus; import org.ovirt.engine.core.common.businessentities.StorageType; import org.ovirt.engine.core.common.businessentities.VDSGroup; -import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; -import org.ovirt.engine.core.common.queries.IdQueryParameters; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; 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.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -121,14 +115,6 @@ getModel().getCdImage().setSelectedItem(template.getIsoPath()); } - Frontend.RunQuery(VdcQueryType.GetConsoleDevices, new IdQueryParameters(template.getId()), new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue) { - List<String> consoleDevices = (List<String>) ((VdcQueryReturnValue)returnValue).getReturnValue(); - getModel().getIsConsoleDeviceEnabled().setEntity(!consoleDevices.isEmpty()); - } - })); - updateTimeZone(template.getTimeZone()); // Update domain list @@ -221,15 +207,6 @@ getModel().getDisksAllocationModel().setIsAliasChangable(true); initStorageDomains(); - } - - @Override - public void oSType_SelectedItemChanged() { - if (getModel().getOSType().getSelectedItem() == null) { - return; - } - - getModel().getIsConsoleDeviceEnabled().setEntity(((VmOsType) getModel().getOSType().getSelectedItem()).isLinux()); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java index 90439fc..7fd2e52 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java @@ -11,13 +11,9 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmTemplate; -import org.ovirt.engine.core.common.queries.IdQueryParameters; -import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.AsyncQuery; -import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -136,14 +132,6 @@ } updateTimeZone(vmBase.getTimeZone()); - - Frontend.RunQuery(VdcQueryType.GetConsoleDevices, new IdQueryParameters(vmBase.getId()), new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue) { - List<String> consoleDevices = (List<String>) ((VdcQueryReturnValue)returnValue).getReturnValue(); - getModel().getIsConsoleDeviceEnabled().setEntity(!consoleDevices.isEmpty()); - } - })); // Update domain list updateDomain(); 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 63947e2..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 @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.List; - import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StoragePool; @@ -13,12 +11,9 @@ import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmWatchdog; -import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; -import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.NGuid; import org.ovirt.engine.ui.frontend.AsyncQuery; -import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; @@ -199,14 +194,6 @@ break; } } - - Frontend.RunQuery(VdcQueryType.GetConsoleDevices, new IdQueryParameters(template.getId()), new AsyncQuery(this, new INewAsyncCallback() { - @Override - public void onSuccess(Object model, Object returnValue) { - List<String> consoleDevices = (List<String>) ((VdcQueryReturnValue)returnValue).getReturnValue(); - getModel().getIsConsoleDeviceEnabled().setEntity(!consoleDevices.isEmpty()); - } - })); initPriority(this.template.getPriority()); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 2198d6a..5fbc5cb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -13,12 +13,12 @@ import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; import org.ovirt.engine.core.common.businessentities.StorageDomain; -import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmType; +import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; import org.ovirt.engine.core.common.businessentities.VmWatchdogType; import org.ovirt.engine.core.common.queries.ConfigurationValues; @@ -610,16 +610,6 @@ privateisSmartcardEnabled = value; } - private NotChangableForVmInPoolEntityModel isConsoleDeviceEnabled; - - public EntityModel getIsConsoleDeviceEnabled() { - return isConsoleDeviceEnabled; - } - - private void setConsoleDeviceEnabled(NotChangableForVmInPoolEntityModel consoleDeviceEnabled) { - this.isConsoleDeviceEnabled = consoleDeviceEnabled; - } - private NotChangableForVmInPoolEntityModel privateIsStateless; public EntityModel getIsStateless() @@ -1092,7 +1082,6 @@ setIsRunAndPause(new NotChangableForVmInPoolEntityModel()); setIsSmartcardEnabled(new NotChangableForVmInPoolEntityModel()); setIsDeleteProtected(new NotChangableForVmInPoolEntityModel()); - setConsoleDeviceEnabled(new NotChangableForVmInPoolEntityModel()); setVncKeyboardLayout(new NotChangableForVmInPoolListModel()); setCdImage(new NotChangableForVmInPoolListModel()); @@ -1242,7 +1231,6 @@ getIsStateless().setEntity(false); getIsRunAndPause().setEntity(false); getIsSmartcardEnabled().setEntity(false); - isConsoleDeviceEnabled.setEntity(false); getIsHighlyAvailable().setEntity(false); getIsAutoAssign().setEntity(true); getIsTemplatePublic().setEntity(true); @@ -1639,8 +1627,6 @@ private void oSType_SelectedItemChanged(Object sender, EventArgs args) { - behavior.oSType_SelectedItemChanged(); - VmOsType osType = (VmOsType) getOSType().getSelectedItem(); setIsWindowsOS(AsyncDataProvider.isWindowsOsType(osType)); 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 5bf65bd..45d91dc 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 @@ -1425,7 +1425,6 @@ model.getDisksAllocationModel().getImageToDestinationDomainMap()); model.startProgress(null); - addVmTemplateParameters.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); Frontend.RunAction(VdcActionType.AddVmTemplate, addVmTemplateParameters, new IFrontendActionAsyncCallback() { @@ -2017,10 +2016,10 @@ model.startProgress(null); + AddVmFromScratchParameters parameters = new AddVmFromScratchParameters(getcurrentVm(), new ArrayList<DiskImage>(), NGuid.Empty); - parameters.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); setVmWatchdogToParams(model, parameters); Frontend.RunAction(VdcActionType.AddVmFromScratch, parameters, @@ -2066,7 +2065,6 @@ vmListModel.getcurrentVm(), unitVmModel.getDisksAllocationModel().getImageToDestinationDomainMap(), Guid.Empty); - param.setConsoleEnabled((Boolean) unitVmModel.getIsConsoleDeviceEnabled().getEntity()); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(param); @@ -2096,7 +2094,6 @@ VmManagementParametersBase params = new VmManagementParametersBase(getcurrentVm()); params.setDiskInfoDestinationMap(model.getDisksAllocationModel().getImageToDestinationDomainMap()); - params.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); ArrayList<VdcActionParametersBase> parameters = new ArrayList<VdcActionParametersBase>(); parameters.add(params); @@ -2178,7 +2175,6 @@ model.startProgress(null); VmManagementParametersBase updateVmParams = new VmManagementParametersBase(getcurrentVm()); - updateVmParams.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); setVmWatchdogToParams(model, updateVmParams); Frontend.RunAction(VdcActionType.UpdateVm, updateVmParams, 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 058275f..3850c5a 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 @@ -4,7 +4,6 @@ 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; @@ -38,8 +37,8 @@ import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType; -import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.UIConstants; +import org.ovirt.engine.ui.uicompat.ConstantsManager; public abstract class VmModelBehaviorBase<TModel extends UnitVmModel> { @@ -83,10 +82,6 @@ public abstract void provisioning_SelectedItemChanged(); public abstract void updateMinAllocatedMemory(); - - public void oSType_SelectedItemChanged() { - // override if needed - } protected void postInitTemplate() { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java index 6efc385..3185449 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java @@ -596,7 +596,6 @@ new AddVmFromSnapshotParameters(getcurrentVm().getStaticData(), snapshot.getId()); parameters.setDiskInfoDestinationMap(imageToDestinationDomainMap); setupAddVmFromSnapshotParameters(parameters); - parameters.setConsoleEnabled((Boolean) model.getIsConsoleDeviceEnabled().getEntity()); model.startProgress(null); -- To view, visit http://gerrit.ovirt.org/15595 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8964206acec22e901370ab45665546d2602493cd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
