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 <lrotenbe@redhat.com>
oVirt · Jun 20, 2022 · 3f01d79 · 3f01d79
1 parent 5c6c93c
commit 3f01d79
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/...les/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/...les/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
@@ -2614,7 +2614,7 @@ public void initDisplayModels(Set<DisplayType> 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/...mmonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/...mmonweb/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<DisplayType> displayTypes) {
+         // We know displayTypes size is > 0
+         if (displayTypes.contains(DisplayType.vga)) {
+             return DisplayType.vga;
+         }
+         return displayTypes.iterator().next();
+    }
+
 }
diff --git a/...org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/NonClusterModelBehaviorBase.java b/...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);
         }
     }