Martin Betak has uploaded a new change for review.

Change subject: frontend: Support for Vm boot menu
......................................................................

frontend: Support for Vm boot menu

Add checkbox to New/Edit VM dialog and RunOnce dialog allowing user to
specify whether menu should be shown on system boot.

Change-Id: Ic181909f9f3c0d68162029fb0584b6d5afc5af5d
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1047624
Signed-off-by: Martin Betak <mbe...@redhat.com>
---
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/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/CoreUnitToVmBaseBuilder.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.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/RunOnceModel.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
M 
frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/BaseVmListModelTest.java
14 files changed, 72 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/26175/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 b45d863..909f3db 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
@@ -1720,4 +1720,7 @@
 
     @DefaultStringValue("Connect")
     String connect();
+
+    @DefaultStringValue("Enable boot menu")
+    String bootMenuEnabled();
 }
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 9ce8f6c..1d1a7e4 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
@@ -635,6 +635,11 @@
     @WithElementId("cdAttached")
     public EntityModelCheckBoxEditor cdAttachedEditor;
 
+    @UiField(provided = true)
+    @Path("bootMenuEnabled.entity")
+    @WithElementId("bootMenuEnabled")
+    public EntityModelCheckBoxEditor bootMenuEnabledEditor;
+
     @UiField
     protected FlowPanel linuxBootOptionsPanel;
 
@@ -716,6 +721,7 @@
         isSmartcardEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, 
new ModeSwitchingVisibilityRenderer());
         isConsoleDeviceEnabledEditor = new 
EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer(), 
true);
         cdAttachedEditor = new EntityModelCheckBoxEditor(Align.LEFT, new 
ModeSwitchingVisibilityRenderer());
+        bootMenuEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new 
ModeSwitchingVisibilityRenderer());
         allowConsoleReconnectEditor = new 
EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer());
         isSoundcardEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, 
new ModeSwitchingVisibilityRenderer());
         ssoMethodNone = new EntityModelRadioButtonEditor("ssoMethod", new 
ModeSwitchingVisibilityRenderer()); //$NON-NLS-1$
@@ -1610,6 +1616,7 @@
         secondBootDeviceEditor.setTabIndex(nextTabIndex++);
         cdAttachedEditor.setTabIndex(nextTabIndex++);
         cdImageEditor.setTabIndex(nextTabIndex++);
+        bootMenuEnabledEditor.setTabIndex(nextTabIndex++);
         kernel_pathEditor.setTabIndex(nextTabIndex++);
         initrd_pathEditor.setTabIndex(nextTabIndex++);
         kernel_parametersEditor.setTabIndex(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 4b147dc..05ad362 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
@@ -636,6 +636,7 @@
                                        <g:upFace 
image='{resources.refreshButtonImage}' />
                                 </g:PushButton>
                                                        </g:HorizontalPanel>
+              <ge:EntityModelCheckBoxEditor ui:field="bootMenuEnabledEditor" 
label="{constants.bootMenuEnabled}" addStyleNames="{style.checkbox}" />
                                                </g:FlowPanel>
                                                <g:FlowPanel 
ui:field="linuxBootOptionsPanel" addStyleNames="{style.sectionPanel}" 
visible="false">
                                                        <g:Label 
addStyleNames="{style.sectionLabel}" text="{constants.linuxBootOptionsVmPopup}" 
/>
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
index 6971852..701d306 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
@@ -139,6 +139,11 @@
     EntityModelCheckBoxEditor attachIsoEditor;
 
     @UiField(provided = true)
+    @Path("bootMenuEnabled.entity")
+    @WithElementId("bootMenuEnabled")
+    EntityModelCheckBoxEditor bootMenuEnabledEditor;
+
+    @UiField(provided = true)
     @Path(value = "runAsStateless.entity")
     @WithElementId("runAsStateless")
     EntityModelCheckBoxEditor runAsStatelessEditor;
@@ -314,6 +319,7 @@
     void initCheckBoxEditors() {
         attachFloppyEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         attachIsoEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
+        bootMenuEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         runAsStatelessEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         runAndPauseEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         useAlternateCredentialsEditor = new 
EntityModelCheckBoxEditor(Align.RIGHT);
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml
index a5b10b2..19ffb1c 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.ui.xml
@@ -180,6 +180,7 @@
                                        </g:VerticalPanel>
                                </g:AbsolutePanel>
 
+        <ge:EntityModelCheckBoxEditor ui:field="bootMenuEnabledEditor" 
label="{constants.bootMenuEnabled}" />
                                <ge:EntityModelCheckBoxEditor 
ui:field="runAsStatelessEditor" />
                                <ge:EntityModelCheckBoxEditor 
ui:field="runAndPauseEditor" />
                        </g:VerticalPanel>
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/CoreUnitToVmBaseBuilder.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/CoreUnitToVmBaseBuilder.java
index 640c294..7fca6ef 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/CoreUnitToVmBaseBuilder.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/CoreUnitToVmBaseBuilder.java
@@ -35,5 +35,6 @@
         
vm.setDefaultDisplayType(model.getDisplayProtocol().getSelectedItem().getEntity());
         
vm.setSerialNumberPolicy(model.getSerialNumberPolicy().getSelectedSerialNumberPolicy());
         
vm.setCustomSerialNumber(model.getSerialNumberPolicy().getCustomSerialNumber().getEntity());
+        vm.setBootMenuEnabled(model.getBootMenuEnabled().getEntity());
     }
 }
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index c6e513a..d1477e6 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -3761,6 +3761,10 @@
         return (Boolean) 
getConfigValuePreConverted(ConfigurationValues.SerialNumberPolicySupported, 
version);
     }
 
+    public static boolean isBootMenuSupported(String version) {
+        return (Boolean) 
getConfigValuePreConverted(ConfigurationValues.BootMenuSupported, version);
+    }
+
     public static List<IStorageModel> getDataStorageModels() {
         ArrayList<IStorageModel> models = new ArrayList<IStorageModel>();
 
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 8f671be..8b6e8fa 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
@@ -297,6 +297,8 @@
         }
 
         BuilderExecutor.build(vm.getStaticData(), getModel(), new 
SerialNumberPolicyVmBaseToUnitBuilder());
+
+        getModel().getBootMenuEnabled().setEntity(vm.isBootMenuEnabled());
     }
 
     private int calculateHostCpus() {
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 6f97d51..010812a 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
@@ -346,6 +346,8 @@
         initPriority(this.vm.getPriority());
 
         BuilderExecutor.build(vm.getStaticData(), getModel(), new 
SerialNumberPolicyVmBaseToUnitBuilder());
+
+        getModel().getBootMenuEnabled().setEntity(vm.isBootMenuEnabled());
     }
 
     @Override
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 fb38877..333cd0a 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
@@ -187,6 +187,8 @@
             getModel().getVmInitEnabled().setEntity(template.getVmInit() != 
null);
 
             BuilderExecutor.build(template, getModel(), new 
SerialNumberPolicyVmBaseToUnitBuilder());
+
+            
getModel().getBootMenuEnabled().setEntity(template.isBootMenuEnabled());
         }
     }
 
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 7b40391..aac05bb 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
@@ -200,6 +200,8 @@
             getModel().getVmInitEnabled().setEntity(vmBase.getVmInit() != 
null);
 
             BuilderExecutor.build(vmBase, getModel(), new 
SerialNumberPolicyVmBaseToUnitBuilder());
+
+            
getModel().getBootMenuEnabled().setEntity(vmBase.isBootMenuEnabled());
         }
     }
 
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
index df2f010..3de1e2c 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
@@ -315,6 +315,16 @@
         this.customPropertySheet = customPropertySheet;
     }
 
+    private EntityModel<Boolean> bootMenuEnabled;
+
+    public EntityModel<Boolean> getBootMenuEnabled() {
+        return bootMenuEnabled;
+    }
+
+    public void setBootMenuEnabled(EntityModel<Boolean> bootMenuEnabled) {
+        this.bootMenuEnabled = bootMenuEnabled;
+    }
+
     private EntityModel<Boolean> privateRunAndPause;
 
     public EntityModel<Boolean> getRunAndPause()
@@ -587,6 +597,8 @@
         // Custom Properties tab
         setCustomPropertySheet(new KeyValueModel());
 
+        setBootMenuEnabled(new EntityModel<Boolean>(false));
+        
getBootMenuEnabled().setIsAvailable(AsyncDataProvider.isBootMenuSupported(vm.getVdsGroupCompatibilityVersion().toString()));
         setRunAndPause(new EntityModel<Boolean>(false));
         setRunAsStateless(new EntityModel<Boolean>(false));
 
@@ -602,10 +614,10 @@
         
getVncKeyboardLayout().setSelectedItem(vm.getDefaultVncKeyboardLayout());
 
         // Host tab
-        setDefaultHost(new ListModel());
+        setDefaultHost(new ListModel<VDS>());
         getDefaultHost().getSelectedItemChangedEvent().addListener(this);
 
-        setIsAutoAssign(new EntityModel());
+        setIsAutoAssign(new EntityModel<Boolean>());
         getIsAutoAssign().getEntityChangedEvent().addListener(this);
 
         // availability/visibility
@@ -635,6 +647,7 @@
         setHashName("run_virtual_machine"); //$NON-NLS-1$
         setIsoImagePath(vm.getIsoPath()); // needs to be called before iso 
list is updated
         getAttachFloppy().setEntity(false);
+        getBootMenuEnabled().setEntity(vm.isBootMenuEnabled());
         getRunAsStateless().setEntity(vm.isStateless());
         getRunAndPause().setEntity(vm.isRunAndPause());
         setHwAcceleration(true);
@@ -698,6 +711,7 @@
         params.setDiskPath(getIsoImagePath());
         params.setFloppyPath(getFloppyImagePath());
         params.setKvmEnable(getHwAcceleration());
+        params.setBootMenuEnabled(getBootMenuEnabled().getEntity());
         params.setRunAndPause(getRunAndPause().getEntity());
         params.setAcpiEnable(true);
         params.setRunAsStateless(getRunAsStateless().getEntity());
@@ -732,7 +746,7 @@
             params.setVmInit(getVmInit().buildCloudInitParameters(this));
         }
 
-        EntityModel displayProtocolSelectedItem = (EntityModel) 
getDisplayProtocol().getSelectedItem();
+        EntityModel<? extends DisplayType> displayProtocolSelectedItem = 
(EntityModel<? extends DisplayType>) getDisplayProtocol().getSelectedItem();
         params.setUseVnc(displayProtocolSelectedItem.getEntity() == 
DisplayType.vnc);
         if (getDisplayConsole_Vnc_IsSelected().getEntity()
                 || getDisplayConsole_Spice_IsSelected().getEntity())
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 f609c3d..757a7c6 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
@@ -1264,6 +1264,16 @@
         this.serialNumberPolicy = value;
     }
 
+    private EntityModel<Boolean> bootMenuEnabled;
+
+    public EntityModel<Boolean> getBootMenuEnabled() {
+        return bootMenuEnabled;
+    }
+
+    public void setBootMenuEnabled(EntityModel<Boolean> bootMenuEnabled) {
+        this.bootMenuEnabled = bootMenuEnabled;
+    }
+
     public UnitVmModel(VmModelBehaviorBase behavior) {
         Frontend.getInstance().getQueryStartedEvent().addListener(this);
         Frontend.getInstance().getQueryCompleteEvent().addListener(this);
@@ -1349,9 +1359,10 @@
         setCustomPropertySheet(new NotChangableForVmInPoolKeyValueModel());
         setDisplayProtocol(new 
NotChangableForVmInPoolListModel<EntityModel<DisplayType>>());
         setSecondBootDevice(new 
NotChangableForVmInPoolListModel<EntityModel<BootSequence>>());
+        setBootMenuEnabled(new NotChangableForVmInPoolEntityModel<Boolean>());
         setPriority(new 
NotChangableForVmInPoolListModel<EntityModel<Integer>>());
-        setVmInitEnabled(new EntityModel(false));
-        setCloudInitEnabled(new EntityModel());
+        setVmInitEnabled(new EntityModel<Boolean>(false));
+        setCloudInitEnabled(new EntityModel<Boolean>());
         setSysprepEnabled(new EntityModel<Boolean>());
         getVmInitEnabled().getEntityChangedEvent().addListener(this);
         setVmInitModel(new VmInitModel());
@@ -1939,7 +1950,7 @@
         DataCenterWithCluster dataCenterWithCluster = 
getDataCenterWithClustersList().getSelectedItem();
         if (dataCenterWithCluster != null && 
dataCenterWithCluster.getDataCenter() != null) {
             
getDisksAllocationModel().setQuotaEnforcementType(dataCenterWithCluster.getDataCenter()
-                    .getQuotaEnforcementType());
+                                                                      
.getQuotaEnforcementType());
         }
 
         updateMigrationOptions();
@@ -1947,6 +1958,14 @@
         handleQxlClusterLevel();
 
         updateWatchdogModels();
+        updateBootMenu();
+    }
+
+    private void updateBootMenu() {
+        if (getSelectedCluster() != null) {
+            Version version = getSelectedCluster().getcompatibility_version();
+            
getBootMenuEnabled().setIsAvailable(AsyncDataProvider.isBootMenuSupported(version.toString()));
+        }
     }
 
     private void handleQxlClusterLevel() {
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/BaseVmListModelTest.java
 
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/BaseVmListModelTest.java
index 0dca2cb..429cea6 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/BaseVmListModelTest.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/BaseVmListModelTest.java
@@ -113,6 +113,7 @@
         when(model.getIsAutoAssign().getEntity()).thenReturn(false);
         
when(model.getMigrationMode().getSelectedItem()).thenReturn(MIGRATION_SUPPORT);
         
when(model.getSelectedMigrationDowntime()).thenReturn(MIGRATION_DOWNTIME);
+        when(model.getBootMenuEnabled().getEntity()).thenReturn(true);
     }
 
     protected void setUpOrigVm(VM origVm) {
@@ -132,6 +133,7 @@
         assertEquals(TIMEZONE, vm.getTimeZone());
         assertEquals(CLUSTER_ID, vm.getVdsGroupId());
         assertEquals(BOOT_SEQUENCE, vm.getDefaultBootSequence());
+        assertTrue(vm.isBootMenuEnabled());
         assertEquals(ISO_NAME, vm.getIsoPath());
         assertEquals(MEM_SIZE, vm.getMemSizeMb());
         assertEquals(MIN_MEM, vm.getMinAllocatedMem());


-- 
To view, visit http://gerrit.ovirt.org/26175
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic181909f9f3c0d68162029fb0584b6d5afc5af5d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Betak <mbe...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to