[pve-devel] [PATCH manager v2] ui: Utils: change default Console order for vms

[pve-devel] [PATCH manager v2] ui: Utils: change default Console order for vms

[Dominik Csapak]

we want to use spice for vms more than xtermjs if both are available
(since spice must be chosen as display in that case)
so the resulting order of preference for vms is:
  spice
  xtermjs
  novnc

since all methods work for containers always, there we use
xtermjs by default, or what is chosen in the datacenter option

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v1:
* fixed the default so that it is only 'vv' for vms, not other
  types of consoles (shell, upgrade,..)

 www/manager6/Utils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index f502950f..7fcda854 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1271,7 +1271,7 @@ Ext.define('PVE.Utils', {
     },
 
     openDefaultConsoleWindow: function(consoles, consoleType, vmid, nodename, vmname, cmd) {
-	var dv = PVE.Utils.defaultViewer(consoles);
+	var dv = PVE.Utils.defaultViewer(consoles, consoleType);
 	PVE.Utils.openConsoleWindow(dv, consoleType, vmid, nodename, vmname, cmd);
     },
 
@@ -1309,7 +1309,7 @@ Ext.define('PVE.Utils', {
 	}
     },
 
-    defaultViewer: function(consoles) {
+    defaultViewer: function(consoles, type) {
 	var allowSpice, allowXtermjs;
 
 	if (consoles === true) {
@@ -1319,7 +1319,7 @@ Ext.define('PVE.Utils', {
 	    allowSpice = consoles.spice;
 	    allowXtermjs = !!consoles.xtermjs;
 	}
-	var dv = PVE.VersionInfo.console || 'xtermjs';
+	let dv = PVE.VersionInfo.console || (type === 'kvm' ? 'vv' : 'xtermjs');
 	if (dv === 'vv' && !allowSpice) {
 	    dv = allowXtermjs ? 'xtermjs' : 'html5';
 	} else if (dv === 'xtermjs' && !allowXtermjs) {
-- 
2.20.1

[pve-devel] applied: [PATCH manager v2] ui: Utils: change default Console order for vms

[Thomas Lamprecht]

On 22.04.21 08:39, Dominik Csapak wrote:
> we want to use spice for vms more than xtermjs if both are available
> (since spice must be chosen as display in that case)
> so the resulting order of preference for vms is:
>   spice
>   xtermjs
>   novnc
> 
> since all methods work for containers always, there we use
> xtermjs by default, or what is chosen in the datacenter option
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> changes from v1:
> * fixed the default so that it is only 'vv' for vms, not other
>   types of consoles (shell, upgrade,..)
> 
>  www/manager6/Utils.js | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
>

applied, thanks! But wondering if form VMs noVNC should be the next in line,
as long as the display property of the VM is not set to a serialX console.

Re: [pve-devel] applied: [PATCH manager v2] ui: Utils: change default Console order for vms

[Dominik Csapak]

On 4/22/21 10:02, Thomas Lamprecht wrote:
> On 22.04.21 08:39, Dominik Csapak wrote:
>> we want to use spice for vms more than xtermjs if both are available
>> (since spice must be chosen as display in that case)
>> so the resulting order of preference for vms is:
>>    spice
>>    xtermjs
>>    novnc
>>
>> since all methods work for containers always, there we use
>> xtermjs by default, or what is chosen in the datacenter option
>>
>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>> ---
>> changes from v1:
>> * fixed the default so that it is only 'vv' for vms, not other
>>    types of consoles (shell, upgrade,..)
>>
>>   www/manager6/Utils.js | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>>
> 
> applied, thanks! But wondering if form VMs noVNC should be the next in line,
> as long as the display property of the VM is not set to a serialX console.
> 

could be nice, but would require adaptation in the status api call
(we only return if a serial terminal is there, not the vm config)