Re: [pve-devel] [RFC common 5/9] cli: factor out abort

2017-12-04 Thread Dominik Csapak
On 11/06/2017 02:54 PM, Thomas Lamprecht wrote: will be reused in later patches too --- src/PVE/CLIHandler.pm | 23 --- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm index 311cc69..4e3342f 100644 --- a/src/PVE/

Re: [pve-devel] [RFC common 4/9] cli: refactor print_bash_completion

2017-12-04 Thread Dominik Csapak
Reviewed-by: Dominik Csapak On 11/06/2017 02:54 PM, Thomas Lamprecht wrote: move variables nearer to where they actually used. drop program name early from argv array drop unnecessary variables --- src/PVE/CLIHandler.pm | 39 +++ 1 file changed, 15 inserti

Re: [pve-devel] [RFC common 3/9] cli: refactor comand name helper

2017-12-04 Thread Dominik Csapak
Reviewed-by: Dominik Csapak On 11/06/2017 02:54 PM, Thomas Lamprecht wrote: use shorter and also a bit faster methods to expand and get comand names --- src/PVE/CLIHandler.pm | 25 +++-- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/PVE/CLIHandler.pm

Re: [pve-devel] [RFC common 2/9] cli: factor out initialisation check

2017-12-04 Thread Dominik Csapak
Reviewed-by: Dominik Csapak On 11/06/2017 02:54 PM, Thomas Lamprecht wrote: --- src/PVE/CLIHandler.pm | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm index 29a7f57..c787ac4 100644 --- a/src/PVE/CLIHandler.pm

Re: [pve-devel] [RFC common 1/9] cli: refactor and use $cmddef directly

2017-12-04 Thread Dominik Csapak
Reviewed-by: Dominik Csapak On 11/06/2017 02:54 PM, Thomas Lamprecht wrote: passing one param less to the helper methods --- src/PVE/CLIHandler.pm | 29 - 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/PVE/CLIHandler.pm b/src/PVE/CLIHandler.pm

[pve-devel] [PATCH dab] add support for Ubuntu 17.10 (artful)

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- DAB.pm | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/DAB.pm b/DAB.pm index 61cf5ad..5631e9e 100644 --- a/DAB.pm +++ b/DAB.pm @@ -351,6 +351,8 @@ sub new { $config->{ostype} = "ubuntu-16.10"; } elsif ($suite eq 'zest

[pve-devel] [RFC cluster v2 09/10] move cluster create to API

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/API2/ClusterConfig.pm | 94 -- data/PVE/CLI/pvecm.pm | 89 +-- 2 files changed, 92 insertions(+), 91 deletions(-) diff --git a/data/PVE/API2/ClusterConfig.pm b/data/P

[pve-devel] [RFC cluster v2 08/10] cluster create: restart corosync & pmxfs in one go and say so

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/CLI/pvecm.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/PVE/CLI/pvecm.pm b/data/PVE/CLI/pvecm.pm index 553dbee..4b4eaa5 100755 --- a/data/PVE/CLI/pvecm.pm +++ b/data/PVE/CLI/pvecm.pm @@ -146,9 +146,8 @@ __PACKAGE__->r

[pve-devel] [RFC cluster v2 06/10] pvecm: add: use API by default

2017-12-04 Thread Thomas Lamprecht
Default to using the API for a add node procedure. But, allow the user to manually fall back to the legacy SSH method. Also fallback if the API detected an not up to date peer. This could be removed in a later release. Signed-off-by: Thomas Lamprecht --- data/PVE/CLI/pvecm.pm | 45 +

[pve-devel] [RFC cluster v2 02/10] node add: factor out code

2017-12-04 Thread Thomas Lamprecht
Factor out common code, which will be used by the new API endpoint to join a cluster and the old legacy SSH method which we will keep for a bit. Signed-off-by: Thomas Lamprecht --- data/PVE/CLI/pvecm.pm | 152 ++ data/PVE/Cluster.pm | 146 +++

[pve-devel] [RFC cluster v2 01/10] move addnode/delnode from CLI to cluster config API

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/API2/ClusterConfig.pm | 210 ++ data/PVE/CLI/pvecm.pm | 223 + 2 files changed, 213 insertions(+), 220 deletions(-) diff --git a/data/PVE/API2/ClusterConfig.pm b/data

[pve-devel] [RFC cluster v2 10/10] api/cluster: add join_info endpoint

2017-12-04 Thread Thomas Lamprecht
Returns all relevant information for joining this cluster securely over the API. Signed-off-by: Thomas Lamprecht --- data/PVE/API2/ClusterConfig.pm | 42 ++ 1 file changed, 42 insertions(+) diff --git a/data/PVE/API2/ClusterConfig.pm b/data/PVE/API2/Clust

[pve-devel] [RFC cluster v2 07/10] cluster create: factor out initial corosync config assembly

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/CLI/pvecm.pm | 77 --- data/PVE/Corosync.pm | 73 2 files changed, 79 insertions(+), 71 deletions(-) diff --git a/data/PVE/CLI/pvecm.pm b/data/PVE/CLI/pv

[pve-devel] [RFC cluster v2 04/10] api: add joint cluster endpoint

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/API2/ClusterConfig.pm | 125 - debian/control.in | 2 + 2 files changed, 126 insertions(+), 1 deletion(-) diff --git a/data/PVE/API2/ClusterConfig.pm b/data/PVE/API2/ClusterConfig.pm index c38feb2

[pve-devel] [RFC cluster v2 00/10] Allow adding a node to a cluster over API

2017-12-04 Thread Thomas Lamprecht
changes v1 -> 2: * 7/10, 8/10, 9/10, 10/10 are new - mostly moving also the create cluster to the API and preparing for the UI component * prev. 1/6 - 5/6 stayed the same * prev. 6/6 (now 6/10): use PVE::PTY directly, not the CLIHandler wrapper So mostly new patches where added, re-sent for ea

[pve-devel] [RFC cluster v2 03/10] return cluster config and authkey in addnode API call

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/API2/ClusterConfig.pm | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/data/PVE/API2/ClusterConfig.pm b/data/PVE/API2/ClusterConfig.pm index fa01022..c38feb2 100644 --- a/data/PVE/API2/ClusterConfig.pm +++ b/d

[pve-devel] [RFC cluster v2 05/10] api/join: check if peer supports addnode over API

2017-12-04 Thread Thomas Lamprecht
Signed-off-by: Thomas Lamprecht --- data/PVE/API2/ClusterConfig.pm | 21 + 1 file changed, 21 insertions(+) diff --git a/data/PVE/API2/ClusterConfig.pm b/data/PVE/API2/ClusterConfig.pm index 9a4d9f5..97706d9 100644 --- a/data/PVE/API2/ClusterConfig.pm +++ b/data/PVE/API2/Clus

[pve-devel] applied: [PATCH manager v3 0/3] Introduce Detach Button for used disks

2017-12-04 Thread Dominik Csapak
___ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel

[pve-devel] [PATCH v2 qemu-server 2/2] enable vncproxy with vncterm for serial ports

2017-12-04 Thread Dominik Csapak
this enables the output via vncterm when the vm has configured a serial port Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 9098a34..a6dc905 100644 --- a/PVE/API2/Qem

[pve-devel] [PATCH v2 manager 3/5] add new xtermjs viewer window to Utils

2017-12-04 Thread Dominik Csapak
Signed-off-by: Dominik Csapak --- www/manager6/Utils.js | 14 ++ 1 file changed, 14 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 3efe4e71..578ba81e 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1156,6 +1156,8 @@ Ext.define('PVE.U

[pve-devel] [PATCH v2 manager 1/5] add termproxy api call for nodes

2017-12-04 Thread Dominik Csapak
and add dependency for pve-xtermjs Signed-off-by: Dominik Csapak --- changes since v1: * whitespace fix * removed unecessary return and timeout * added dependency in debian/control PVE/API2/Nodes.pm | 96 +++ debian/control| 1 + 2 files c

[pve-devel] [PATCH v2 qemu-server 1/2] add termproxy api call

2017-12-04 Thread Dominik Csapak
for xtermjs web client Signed-off-by: Dominik Csapak --- changes since v1: * whitespace fix * removed unecessary return PVE/API2/Qemu.pm | 94 1 file changed, 94 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 5f9d105

[pve-devel] [PATCH v2] add new xtermjs client

2017-12-04 Thread Dominik Csapak
this series adds support for the xtermjs terminal client for the host shell, container consoles, and serial terminal for qemu vms this series depends on the 'pve-xtermjs' package to be found under: https://git.proxmox.com/?p=pve-xtermjs.git;a=summary changes since v1: * added dependecy in pve-ma

[pve-devel] [PATCH v2 container 1/1] add termproxy api call for lxc

2017-12-04 Thread Dominik Csapak
Signed-off-by: Dominik Csapak --- changes since v1: * whitespace fix * removed unecessary return src/PVE/API2/LXC.pm | 83 + 1 file changed, 83 insertions(+) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index a1897c7..662e0a0 100644 -

[pve-devel] [PATCH v2 manager 4/5] add xtermjs flag to VNCConsole iframe

2017-12-04 Thread Dominik Csapak
so that we can open an xtermjs iframe instead of novnc Signed-off-by: Dominik Csapak --- changes since v1: * removed site change on destroy www/manager6/VNCConsole.js | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/www/manager6/VNCConsole.js b/www/manager6/VNCConsole.js

[pve-devel] [PATCH v2 manager 5/5] add xtermjs to consolebutton

2017-12-04 Thread Dominik Csapak
also rework the button. move most things in the static configuration Signed-off-by: Dominik Csapak --- changes since v1: * reworked button to a mostly declarative syntax www/manager6/button/ConsoleButton.js | 74 +--- www/manager6/lxc/Config.js | 30

[pve-devel] [PATCH v2 manager 2/5] add xtermjs to pveproxy dirs

2017-12-04 Thread Dominik Csapak
Signed-off-by: Dominik Csapak --- PVE/Service/pveproxy.pm | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index 7d39900a..ec1eb9a5 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -51,6 +51,7 @@ my

[pve-devel] [PATCH common 2/2] wait_for_vnc_port: allow to enforce IP family

2017-12-04 Thread Thomas Lamprecht
Most times a port was requested for a specified IP family (v4, v6) only. Thus also ensure that the port from the respective family got ready, else we may return on a false positive. As we had no user setting the $timeout param we can add the $family param as second one, it'll get used more often,

[pve-devel] [PATCH common 1/2] wait_for_vnc_port: die if port did not get ready

2017-12-04 Thread Thomas Lamprecht
All of our users expected this behavior and did not check for undef Signed-off-by: Thomas Lamprecht --- src/PVE/Tools.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index c3ac0e8..c2c2f93 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tool

Re: [pve-devel] [PATCH qemu-server 2/2] enable vncproxy with vncterm for serial ports

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > this enables the output via vncterm when the vm has > configured a serial port > > Signed-off-by: Dominik Csapak > --- > PVE/API2/Qemu.pm | 14 +++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/PVE/API2/Qemu.pm b/P

Re: [pve-devel] [PATCH manager 5/5] add xtermjs to consolebutton

2017-12-04 Thread Dominik Csapak
On 12/04/2017 10:07 AM, Thomas Lamprecht wrote: I assume this is temporarily for testing? Or do we want to have both, noVNC and xtermjs side by side as inline console for CTs/ Node Shell? Probably at least not forever. yes, as long as the xtermjs client is not battle-tested, i would like to ha

Re: [pve-devel] [PATCH manager 4/5] add xtermjs flag to VNCConsole iframe

2017-12-04 Thread Dominik Csapak
On 12/04/2017 09:48 AM, Thomas Lamprecht wrote: On 12/01/2017 09:29 AM, Dominik Csapak wrote: so that we can open an xtermjs iframe instead of novnc Signed-off-by: Dominik Csapak --- www/manager6/VNCConsole.js | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/w

Re: [pve-devel] [PATCH qemu-server 1/2] add termproxy api call

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > for xtermjs web client > > Signed-off-by: Dominik Csapak > --- > PVE/API2/Qemu.pm | 96 > > 1 file changed, 96 insertions(+) > > diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm > index 5f9

Re: [pve-devel] [PATCH container 1/1] add termproxy api call for lxc

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > Signed-off-by: Dominik Csapak > --- > src/PVE/API2/LXC.pm | 84 > + > 1 file changed, 84 insertions(+) > > diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm > index a1897c7..e260acf 100644 >

Re: [pve-devel] [PATCH manager 5/5] add xtermjs to consolebutton

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > Signed-off-by: Dominik Csapak > --- > www/manager6/button/ConsoleButton.js | 27 --- > www/manager6/lxc/Config.js | 30 +- > www/manager6/node/Config.js | 9 + > 3 files

Re: [pve-devel] [PATCH manager 4/5] add xtermjs flag to VNCConsole iframe

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > so that we can open an xtermjs iframe instead of novnc > > Signed-off-by: Dominik Csapak > --- > www/manager6/VNCConsole.js | 11 ++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/www/manager6/VNCConsole.js b/www/manag

Re: [pve-devel] [PATCH manager 3/5] add new xtermjs viewer window to Utils

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > Signed-off-by: Dominik Csapak > --- > www/manager6/Utils.js | 14 ++ > 1 file changed, 14 insertions(+) > > diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js > index 3efe4e71..578ba81e 100644 > --- a/www/manager6/Utils.js > +++

Re: [pve-devel] [PATCH manager 2/5] add xtermjs to pveproxy dirs

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > Signed-off-by: Dominik Csapak > --- > PVE/Service/pveproxy.pm | 9 - > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm > index 7d39900a..ec1eb9a5 100755 > --- a/PVE/Service/p

Re: [pve-devel] [PATCH manager 1/5] add termproxy api call for nodes

2017-12-04 Thread Thomas Lamprecht
On 12/01/2017 09:29 AM, Dominik Csapak wrote: > Signed-off-by: Dominik Csapak Please add a dependency to pve-xtermjs together with this here, for the version which should get applied, adding it "later on" may let us forget it at all.. > --- > PVE/API2/Nodes.pm | 100 >