From 3f01d795adcbcde4178b9190992c2f61c33b1b57 Mon Sep 17 00:00:00 2001 From: Liran Rotenberg Date: Wed, 15 Jun 2022 19:39:50 +0300 Subject: [PATCH] frontend: default vga when backing from headless When switching back from headless VM, the default is SPICE/QXL. This patch changes it to VNC/VGA. Change-Id: Ic63dbf22e3cd199fc782dc8e8963c8899478a6ae Signed-off-by: Liran Rotenberg --- .../engine/ui/uicommonweb/models/vms/UnitVmModel.java | 2 +- .../ui/uicommonweb/models/vms/VmModelBehaviorBase.java | 8 ++++++++ .../vms/instancetypes/NonClusterModelBehaviorBase.java | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) 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 d0b014fd3af..201ced1a778 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 @@ -2614,7 +2614,7 @@ public void initDisplayModels(Set displayTypes, DisplayType selecte if (displayTypes.contains(selectedDisplayType)) { getDisplayType().setItems(displayTypes, selectedDisplayType); } else if (displayTypes.size() > 0) { - getDisplayType().setItems(displayTypes, displayTypes.iterator().next()); + getDisplayType().setItems(displayTypes, behavior.getDefaultDisplayType(displayTypes)); } } 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 faa238947b1..86201c606b1 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 @@ -1864,4 +1864,12 @@ && getModel().getDisplayType().getItems().contains(DisplayType.bochs)) { } } + protected DisplayType getDefaultDisplayType(Set displayTypes) { + // We know displayTypes size is > 0 + if (displayTypes.contains(DisplayType.vga)) { + return DisplayType.vga; + } + return displayTypes.iterator().next(); + } + } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/NonClusterModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/NonClusterModelBehaviorBase.java index fb8bdd2d7c0..3e915428b09 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/NonClusterModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/NonClusterModelBehaviorBase.java @@ -39,8 +39,8 @@ protected void initDisplayTypes(DisplayType selected, UnitVmModel.GraphicsTypes initGraphicsModel(selectedGrahicsTypes); if (selected == DisplayType.none) { - getModel().getDisplayType().setSelectedItem(DisplayType.qxl); - getModel().getGraphicsType().setSelectedItem(UnitVmModel.GraphicsTypes.SPICE); + getModel().getDisplayType().setSelectedItem(DisplayType.vga); + getModel().getGraphicsType().setSelectedItem(UnitVmModel.GraphicsTypes.VNC); getModel().getIsHeadlessModeEnabled().setEntity(true); } }