pve-common.git
10 months agofix #1914: CLIFormatter: check also for existence of 'type'
Dominik Csapak [Mon, 17 Sep 2018 08:32:03 +0000 (10:32 +0200)]
fix #1914: CLIFormatter: check also for existence of 'type'

we sometimes define

result => {}

on an api call, so check that result->{type} is defined
and guess the type if not

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
10 months agoINotify.pm: add methods for reading/writing /etc/hosts
Dominik Csapak [Wed, 12 Sep 2018 08:24:11 +0000 (10:24 +0200)]
INotify.pm: add methods for reading/writing /etc/hosts

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
10 months agoINotify.pm: use run_command instead of open for calling diff
Dominik Csapak [Thu, 13 Sep 2018 12:55:52 +0000 (14:55 +0200)]
INotify.pm: use run_command instead of open for calling diff

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
10 months agodecode comments in /etc/network/interfaces as utf8
Dominik Csapak [Thu, 13 Sep 2018 12:55:51 +0000 (14:55 +0200)]
decode comments in /etc/network/interfaces as utf8

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
10 months agoapi_dump_full: use api_clone_schema() for 'returns' schema
Dietmar Maurer [Thu, 13 Sep 2018 10:53:36 +0000 (12:53 +0200)]
api_dump_full: use api_clone_schema() for 'returns' schema

This  convert indexed parameters like -net\d+ to -net[n], so resulting dump
is smaller.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
10 months agoINotify: add tests for non-defined vlan bridge ports
Wolfgang Bumiller [Tue, 11 Sep 2018 12:10:36 +0000 (14:10 +0200)]
INotify: add tests for non-defined vlan bridge ports

This tests the case covered by the previous commit

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
10 months agoInotify: check bridgeport: fix vlan interface not defined
Alexandre Derumier [Tue, 28 Aug 2018 11:31:53 +0000 (13:31 +0200)]
Inotify: check bridgeport: fix vlan interface not defined

We can add to a bridge a non defined vlan interface.
We only need to check that physical interface exist

example:
    auto eno1
    iface eno1 inet manual

    auto vmbr0
    iface vmbr0 inet manual
        bridge_ports eno1.1

[w.bumiller@proxmox.com: style & commit message fixup]
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
10 months agoInotify: fix mtu check
Alexandre Derumier [Tue, 4 Sep 2018 14:36:49 +0000 (16:36 +0200)]
Inotify: fix mtu check

- special check for bond, set parent mtu from slaves mtu if no defined.

- error if parent mtu is lower than child mtu (not bigger)

- return if child mtu is not defined

- fix vlan check (parent/child was inverted)

10 months agoREADME.dev: enhance installing build-dependcy section
Thomas Lamprecht [Wed, 5 Sep 2018 08:57:49 +0000 (10:57 +0200)]
README.dev: enhance installing build-dependcy section

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
10 months agoREADME.dev: note that one can start from a PVE installation
Thomas Lamprecht [Wed, 5 Sep 2018 08:26:37 +0000 (10:26 +0200)]
README.dev: note that one can start from a PVE installation

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
10 months agoRework of the installation documentation
Martin Beckert [Fri, 24 Aug 2018 10:26:45 +0000 (12:26 +0200)]
Rework of the installation documentation

10 months agorun_fork_with_timeout: handle SIGTERM
Dominik Csapak [Tue, 21 Aug 2018 13:07:25 +0000 (15:07 +0200)]
run_fork_with_timeout: handle SIGTERM

when stopping a worker while doing a run_fork_with_timeout,
we want to handle that there and send the child the SIGTERM
so that it can clean up

for this we have to use readline_nointr,
because the read from the pipe gets interrupted by the signal

this partially fixes #1874
as we now correctly clean up the new disk, except if it is
on lvm/lvmthin (possibly other storages as well), and use the old disk
in the config

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
10 months agoadd readline_nointr to Tools
Dominik Csapak [Tue, 21 Aug 2018 13:07:24 +0000 (15:07 +0200)]
add readline_nointr to Tools

this is a wrapper to have an uninterruptible readline
so that we can read e.g. from a pipe even if interrupted by
a signal

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
11 months agorender_bytes: avoid untaint by simply change the sprintf call
Dietmar Maurer [Mon, 6 Aug 2018 11:36:23 +0000 (13:36 +0200)]
render_bytes: avoid untaint by simply change the sprintf call

There is no need to untaint if we do it this way (no idea why).

11 months agorender_bytes: check format, untaint before calling sprintf
Dietmar Maurer [Mon, 6 Aug 2018 11:05:23 +0000 (13:05 +0200)]
render_bytes: check format, untaint before calling sprintf

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agoprint_usage_short: do not group subcommands
Dietmar Maurer [Tue, 31 Jul 2018 09:55:42 +0000 (11:55 +0200)]
print_usage_short: do not group subcommands

For examply, do not group 'qm guest' usage.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agogenerate_usage_str: do not group sub-commands
Dietmar Maurer [Tue, 31 Jul 2018 08:38:46 +0000 (10:38 +0200)]
generate_usage_str: do not group sub-commands

Usually, sub commands already form a logical group, so further grouping
just adds confusion (see 'qm' as example)

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agoprint_api_result: fix test for undefined $result_schema
Dietmar Maurer [Tue, 31 Jul 2018 06:29:45 +0000 (08:29 +0200)]
print_api_result: fix test for undefined $result_schema

11 months agoprint_api_result: allow to pass undefined schema
Dietmar Maurer [Mon, 30 Jul 2018 13:09:33 +0000 (15:09 +0200)]
print_api_result: allow to pass undefined schema

This is useful if we do not have a fixed schema, for example to
print results from qemu agent commands.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agoprint_api_result_plain: new helper
Dietmar Maurer [Fri, 27 Jul 2018 13:22:30 +0000 (15:22 +0200)]
print_api_result_plain: new helper

Usefull to print result without borders an headers.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agoprint_text_table: align numbers to the right side
Dietmar Maurer [Fri, 27 Jul 2018 12:00:28 +0000 (14:00 +0200)]
print_text_table: align numbers to the right side

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agoprint_text_table: untaint $width
Dietmar Maurer [Fri, 27 Jul 2018 12:55:17 +0000 (14:55 +0200)]
print_text_table: untaint $width

The value of $width depends on possible untainted $data (for example
task logs read from external files).

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agobump version to 5.0-38
Dietmar Maurer [Fri, 27 Jul 2018 08:56:13 +0000 (10:56 +0200)]
bump version to 5.0-38

11 months agogetopt_usage: always remove $standard_output_options
Dietmar Maurer [Fri, 27 Jul 2018 05:23:39 +0000 (07:23 +0200)]
getopt_usage: always remove $standard_output_options

Tools like pvesh and pveclient pass them as normal arguments. We use
a simply heuristic to test if there is an 'output_format' parameter.
If so, we remove all $standard_output_options and display [FORMAT_OPTIONS]
instead.

11 months agogetopt_usage: do not display $standard_output_options
Dietmar Maurer [Thu, 26 Jul 2018 11:58:50 +0000 (13:58 +0200)]
getopt_usage: do not display $standard_output_options

Instead, simply add [FORMAT_OPTIONS] to the usage string.

11 months agointrocude new output format 'yaml'
Dietmar Maurer [Thu, 26 Jul 2018 10:02:45 +0000 (12:02 +0200)]
introcude new output format 'yaml'

11 months agoPVE::CLIFormatter - pass terminal option as separate parameter
Dietmar Maurer [Thu, 26 Jul 2018 09:25:37 +0000 (11:25 +0200)]
PVE::CLIFormatter - pass terminal option as separate parameter

This simplifies usage, because we can simple omit the $terminal_opts
parameter in most cases (automatically call query_terminal_option) while
still setting $options.

11 months agoPVE::Certificate - set renderers for unix epoch and 'san'
Dietmar Maurer [Wed, 25 Jul 2018 12:59:25 +0000 (14:59 +0200)]
PVE::Certificate - set renderers for unix epoch and 'san'

11 months agoPVE::CLIFormatter - new 'yaml' renderer
Dietmar Maurer [Thu, 26 Jul 2018 07:50:25 +0000 (09:50 +0200)]
PVE::CLIFormatter - new 'yaml' renderer

Generates nice and readable output for list of string and simple objects.

11 months agocli: print_text_table: correctly handle sort_key 0
Dietmar Maurer [Wed, 25 Jul 2018 12:55:30 +0000 (14:55 +0200)]
cli: print_text_table: correctly handle sort_key 0

11 months agoPVE::CLIHandler - allow to define additional parameters for output formatter
Dietmar Maurer [Wed, 25 Jul 2018 07:13:34 +0000 (09:13 +0200)]
PVE::CLIHandler - allow to define additional parameters for output formatter

Best shown with a example:

my $test_formatter = sub {
    my ($res, $result_schema, $fmt_param) = @_;
    PVE::CLIFormatter::print_api_result($res, $result_schema, undef, $fmt_param);
};

$cmddef = [ __PACKAGE__, 'test', [], undef, $test_formatter, $PVE::RESTHandler::standard_output_options],

11 months agocli: remove all output formatter magic from CLIHandler
Dietmar Maurer [Tue, 24 Jul 2018 11:36:42 +0000 (13:36 +0200)]
cli: remove all output formatter magic from CLIHandler

- and rename format to 'output-format'

- provide a method to add properties to schema:
PVE::RESTHandler::add_standard_output_properties

- provide methods to extract output properties:
PVE::RESTHandler::extract_standard_output_properties()

11 months agoPVE::ACME - untaint saved account data
Dietmar Maurer [Thu, 26 Jul 2018 08:45:25 +0000 (10:45 +0200)]
PVE::ACME - untaint saved account data

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
11 months agoapi dump: do not skip indexed params with only one index
Dominik Csapak [Mon, 23 Jul 2018 10:11:09 +0000 (12:11 +0200)]
api dump: do not skip indexed params with only one index

We transform indexed parameters (like scsi0 scsi1 ...) to a single
scsi[n]. The check if we should transform did not handle the case
where a parameter was indexed but (currently) only index 0 existed.
Such definitions where simply skipped and seemed then to miss from
places using the API dump, like the api-viewer.

We now only skip those parameters with an index > 0 where the same
parameter with index 0 is defined.

This fixes a missing efidisk0 entry in an API dump[0].

[0]: https://forum.proxmox.com/threads/efidisk0-creation-missing-from-api.45624/

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agobump version to 5.0-37
Thomas Lamprecht [Wed, 18 Jul 2018 08:48:05 +0000 (10:48 +0200)]
bump version to 5.0-37

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agofixup: parameters vs properties typo
Wolfgang Bumiller [Wed, 18 Jul 2018 08:42:24 +0000 (10:42 +0200)]
fixup: parameters vs properties typo

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agocli_handler: make standard options opt-in
Thomas Lamprecht [Tue, 17 Jul 2018 14:19:31 +0000 (16:19 +0200)]
cli_handler: make standard options opt-in

The new standard options overwrite some already existing options in
already existing CLI tools, which is surely no good, e.g. vzdump
already has an quiet option which now gets overwritten, thus any
backup triggered by CRON always sents out an (additional) email.

Further, they may even only have an effect if the respective CLI
command uses an CLIFormatter print* method to output things.

And for some commands, like 'pvecm status' they may even never make
sense, as they exec an external program which doesn't honors nor gets
those std options...
Also some internal commands, like 'qm mtunnel' will never use it, as
probably even "normal" commands, as it may simply not make sense for
every command..

So make it opt-in for now, any CLI command can set std-output-opts to
get them.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agobump version to 5.0-36
Thomas Lamprecht [Tue, 10 Jul 2018 12:02:35 +0000 (14:02 +0200)]
bump version to 5.0-36

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agoprint_api_result: skip undefined object values
Dietmar Maurer [Tue, 10 Jul 2018 11:51:28 +0000 (13:51 +0200)]
print_api_result: skip undefined object values

We use objects to return VM configurations, so we uĆ³nly want to display
defined values.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agooutput format options: remove 'plain', add 'json-pretty'
Dietmar Maurer [Tue, 10 Jul 2018 11:51:27 +0000 (13:51 +0200)]
output format options: remove 'plain', add 'json-pretty'

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIFormatter::print_api_result - remove parameter $format
Dietmar Maurer [Tue, 10 Jul 2018 11:51:26 +0000 (13:51 +0200)]
PVE::CLIFormatter::print_api_result - remove parameter $format

Instead, we pass it within $options.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli_handler: pass common output options as separate parameter
Dietmar Maurer [Tue, 10 Jul 2018 11:51:25 +0000 (13:51 +0200)]
cli_handler: pass common output options as separate parameter

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIFormatter - implement new output options
Dietmar Maurer [Tue, 10 Jul 2018 11:51:24 +0000 (13:51 +0200)]
PVE::CLIFormatter - implement new output options

quiet: dont print anything
noheader: supres headers
noborder: no borders
human-readable: use renderers
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agotests: test newly added interfaces individually
Wolfgang Bumiller [Tue, 10 Jul 2018 10:27:29 +0000 (12:27 +0200)]
tests: test newly added interfaces individually

And add eth2/3 to /proc/net/dev, that way we don't need to
create them "virtually" (which we shouldn't, for physical
interfaces).

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agofixup: don't use exists boolean
Wolfgang Bumiller [Tue, 10 Jul 2018 10:00:14 +0000 (12:00 +0200)]
fixup: don't use exists boolean

The previous condition didn't fail tests because it was
always false. The 'exists' property is not actually usable
when writing the interface file. It is merely a hint that
the interface existed in /proc/net/dev while parsing the
interfaces file and is otherwise actually unused here.

Simply check for the existence of the interface in $ifaces.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agofixup: compare MTUs numerically
Wolfgang Bumiller [Tue, 10 Jul 2018 09:55:39 +0000 (11:55 +0200)]
fixup: compare MTUs numerically

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agowhitespace fixup
Wolfgang Bumiller [Tue, 10 Jul 2018 09:55:21 +0000 (11:55 +0200)]
whitespace fixup

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agocleanup: whitespace and error message consistency
Wolfgang Bumiller [Tue, 10 Jul 2018 09:53:01 +0000 (11:53 +0200)]
cleanup: whitespace and error message consistency

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
12 months agoInotify : add mtu option
Alexandre Derumier [Thu, 5 Jul 2018 00:56:34 +0000 (02:56 +0200)]
Inotify : add mtu option

also check if mtu value is lower than parent interface

fixme: vxlan interface should be 50bytes lower than outgoing interface
       we need to find which interface is used (unicast/multicast/frr)

12 months agoInotify : add check vlan
Alexandre Derumier [Thu, 5 Jul 2018 00:56:33 +0000 (02:56 +0200)]
Inotify : add check vlan

verify than parent interface exist
verify than parent interface type is eth,bond,bridge
verify than parent bridge is vlan aware if type bridge

12 months agoInotify : add check_bond
Alexandre Derumier [Thu, 5 Jul 2018 00:56:32 +0000 (02:56 +0200)]
Inotify : add check_bond

verify than bond slaves exist && type is eth

12 months agoInotify : add bridge ports options
Alexandre Derumier [Thu, 5 Jul 2018 00:56:31 +0000 (02:56 +0200)]
Inotify : add bridge ports options

12 months agoInotify : add vxlan interface support
Alexandre Derumier [Thu, 5 Jul 2018 00:56:30 +0000 (02:56 +0200)]
Inotify : add vxlan interface support

12 months agoPVE::RESTHandler::generate_usage_str - new static method to generate usage from ...
Dietmar Maurer [Fri, 6 Jul 2018 07:30:07 +0000 (09:30 +0200)]
PVE::RESTHandler::generate_usage_str - new static method to generate usage from $info

This is useful to generate usage information with pveclient, where we do not have
handler classes at all.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIFormatter::print_api_result - use print_api_list to print arrays
Dietmar Maurer [Thu, 5 Jul 2018 07:26:27 +0000 (09:26 +0200)]
PVE::CLIFormatter::print_api_result - use print_api_list to print arrays

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoCLIFormatter - implement renderer for timestamps using GMT
Dietmar Maurer [Thu, 5 Jul 2018 06:48:03 +0000 (08:48 +0200)]
CLIFormatter - implement renderer for timestamps using GMT

12 months agoPVE::CLIFormatter::data_to_text - add parameter $options
Dietmar Maurer [Wed, 4 Jul 2018 13:24:52 +0000 (15:24 +0200)]
PVE::CLIFormatter::data_to_text - add parameter $options

Also pass $options to renderer functions.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoCLIFormatter - implement renderer for timestamps
Dietmar Maurer [Wed, 4 Jul 2018 11:28:27 +0000 (13:28 +0200)]
CLIFormatter - implement renderer for timestamps

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIHandler - allow to set LOG ID with $ENV{PVE_LOG_ID}
Dietmar Maurer [Wed, 4 Jul 2018 08:52:26 +0000 (10:52 +0200)]
PVE::CLIHandler - allow to set LOG ID with $ENV{PVE_LOG_ID}

We use this with 'pvesh'.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoJSONSchema: register new standard option 'pve-output-format'
Dietmar Maurer [Mon, 2 Jul 2018 11:34:16 +0000 (13:34 +0200)]
JSONSchema: register new standard option 'pve-output-format'

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIFormatter::extract_properties_to_print - new helper
Dietmar Maurer [Mon, 2 Jul 2018 11:34:15 +0000 (13:34 +0200)]
PVE::CLIFormatter::extract_properties_to_print - new helper

This improves sort order. We now priorize required values, and list
them before optional values.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoCLIFormatter: define some commonly useful rendering functions
Dietmar Maurer [Tue, 3 Jul 2018 11:11:01 +0000 (13:11 +0200)]
CLIFormatter: define some commonly useful rendering functions

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoJSONSchema: define 'renderer' property
Dietmar Maurer [Mon, 2 Jul 2018 11:34:13 +0000 (13:34 +0200)]
JSONSchema: define 'renderer' property

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_text_table: restore autoformat behavior
Thomas Lamprecht [Fri, 29 Jun 2018 12:50:08 +0000 (14:50 +0200)]
cli: print_text_table: restore autoformat behavior

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agocli: print_text_table: support multiline data
Dietmar Maurer [Fri, 29 Jun 2018 11:15:26 +0000 (13:15 +0200)]
cli: print_text_table: support multiline data

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: data_to_text: never render undefined values
Dietmar Maurer [Fri, 29 Jun 2018 11:15:25 +0000 (13:15 +0200)]
cli: data_to_text: never render undefined values

To make it visible when the API return undefined values.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIFormatter::query_terminal_options - new helper
Dietmar Maurer [Fri, 29 Jun 2018 11:15:24 +0000 (13:15 +0200)]
PVE::CLIFormatter::query_terminal_options - new helper

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_api_result: add/use new encoding option
Dietmar Maurer [Fri, 29 Jun 2018 11:15:23 +0000 (13:15 +0200)]
cli: print_api_result: add/use new encoding option

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoCLIFormatter: implement tables with utf8 borders
Dietmar Maurer [Fri, 29 Jun 2018 11:15:22 +0000 (13:15 +0200)]
CLIFormatter: implement tables with utf8 borders

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoCLIFormatter: pass options as hash
Dietmar Maurer [Fri, 29 Jun 2018 11:15:21 +0000 (13:15 +0200)]
CLIFormatter: pass options as hash

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_text_table: allow to limit output width
Dietmar Maurer [Fri, 29 Jun 2018 11:15:20 +0000 (13:15 +0200)]
cli: print_text_table: allow to limit output width

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: data_to_text: pass property info
Dietmar Maurer [Fri, 29 Jun 2018 11:15:19 +0000 (13:15 +0200)]
cli: data_to_text: pass property info

So that we can display defaults, render boolean nicely, or call arbitrary render
functions ...

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::JSONSchema::register_renderer - allow to register renderers by name
Dietmar Maurer [Fri, 29 Jun 2018 11:15:18 +0000 (13:15 +0200)]
PVE::JSONSchema::register_renderer - allow to register renderers by name

We want to use those renderer to format CLI output nicely.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_api_result: use print_api_list to print objects
Dietmar Maurer [Fri, 29 Jun 2018 11:15:17 +0000 (13:15 +0200)]
cli: print_api_result: use print_api_list to print objects

In order to draw the new asciiart border ...

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_text_table: allow to draw ascii art borders
Dietmar Maurer [Fri, 29 Jun 2018 11:15:16 +0000 (13:15 +0200)]
cli: print_text_table: allow to draw ascii art borders

format can now be:

plain => what we had with 'text' before
text => print with borders (default)
json

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agotrivial: fixup: no double semicolons
Thomas Lamprecht [Fri, 29 Jun 2018 10:40:07 +0000 (12:40 +0200)]
trivial: fixup: no double semicolons

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agofoolowup: improve/add comments and spacing
Thomas Lamprecht [Fri, 29 Jun 2018 09:57:49 +0000 (11:57 +0200)]
foolowup: improve/add comments and spacing

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agofix #1819: fork_worker: ensure sync'ed workers control terminal
Stoiko Ivanov [Fri, 29 Jun 2018 09:21:18 +0000 (11:21 +0200)]
fix #1819: fork_worker: ensure sync'ed workers control terminal

Use setpgid + tcsetpgrp instead of setsid if $sync (invocation via
cli), thus keeping /dev/tty - ssh-copy-id/ssh need it to read the
password, and putting the child in the forground. Further, ignore
SIGTTOU in child process (otherwise it gets stopped upon tcsetpgrp)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agoPVE/CLIFormatter.pm - new class to generate/format CLI output
Dietmar Maurer [Thu, 28 Jun 2018 07:39:42 +0000 (09:39 +0200)]
PVE/CLIFormatter.pm - new class to generate/format CLI output

Moved code from CLIHandler.pm into this file.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agobump version to 5.0-35
Thomas Lamprecht [Wed, 27 Jun 2018 10:35:38 +0000 (12:35 +0200)]
bump version to 5.0-35

12 months agod/control: break pve-manager < 5.2-5 and pmg-api < 5.0-74
Thomas Lamprecht [Wed, 27 Jun 2018 13:33:41 +0000 (15:33 +0200)]
d/control: break pve-manager < 5.2-5 and pmg-api < 5.0-74

12 months agorest/cli: rename param mapping related variable to shorter versions
Thomas Lamprecht [Wed, 27 Jun 2018 11:02:36 +0000 (13:02 +0200)]
rest/cli: rename param mapping related variable to shorter versions

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agoremove read_password_func from cli handler
Dominik Csapak [Thu, 21 Jun 2018 12:36:52 +0000 (14:36 +0200)]
remove read_password_func from cli handler

we have a param_mapping now, with which we can impement that

e.g. instead of using:

sub read_password {
    # read password
}

we can do:

sub param_mapping {
    my ($name) = @_;

    my $password_map = ['password', sub{
# read password
    }, '<password', 1];

    my $mapping = {
'apicall1' => [$password_map],
'apicall2' => [$password_map],
...
    };

    return $mapping->{$name};
}

this has the advantage that we can use different subs for different
api calls (e.g. pveum passwd vs pveum ticket)

if a CLIHandler implemenation still has a read_password sub and no
param_mapping, we generate one for them with read_password as the
sub for the standard mapping 'pve-password'

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
12 months agocli: print_text_table: another fix for poperties without schema
Dietmar Maurer [Wed, 27 Jun 2018 10:01:40 +0000 (12:01 +0200)]
cli: print_text_table: another fix for poperties without schema

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_text_table: die if no property info not needed anymore
Thomas Lamprecht [Wed, 27 Jun 2018 09:49:52 +0000 (11:49 +0200)]
cli: print_text_table: die if no property info not needed anymore

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agocli: print_text_table: fix for poperties without schema
Dietmar Maurer [Wed, 27 Jun 2018 09:44:49 +0000 (11:44 +0200)]
cli: print_text_table: fix for poperties without schema

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agocli: print_text_table: followup code cleanup
Thomas Lamprecht [Wed, 27 Jun 2018 09:28:36 +0000 (11:28 +0200)]
cli: print_text_table: followup code cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agocli: print_text_table: default to autosort on
Thomas Lamprecht [Wed, 27 Jun 2018 09:23:25 +0000 (11:23 +0200)]
cli: print_text_table: default to autosort on

we more often want to sort by the leftmost valid column than not.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agocli: print_api_result: simplify props_to_print code
Thomas Lamprecht [Tue, 26 Jun 2018 13:55:26 +0000 (15:55 +0200)]
cli: print_api_result: simplify props_to_print code

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 months agoPVE::CLIHandler::print_text_table - cleanup, directly use json schema data
Dietmar Maurer [Wed, 27 Jun 2018 08:50:11 +0000 (10:50 +0200)]
PVE::CLIHandler::print_text_table - cleanup, directly use json schema data

This way we can access all type information and can use that to sort
numeric columns correctly.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIHandler::print_text_table - add option $sort_key
Dietmar Maurer [Wed, 27 Jun 2018 08:50:10 +0000 (10:50 +0200)]
PVE::CLIHandler::print_text_table - add option $sort_key

Now, we do not change the ordering by default.

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIHandler::data_to_text: return '' for undef
Stoiko Ivanov [Tue, 26 Jun 2018 09:33:46 +0000 (11:33 +0200)]
PVE::CLIHandler::data_to_text: return '' for undef

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
12 months agoPVE::CLIHandler::print_api_result - add $props_to_print parameter
Dietmar Maurer [Mon, 25 Jun 2018 12:42:18 +0000 (14:42 +0200)]
PVE::CLIHandler::print_api_result - add $props_to_print parameter

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
12 months agoPVE::CLIHandler::print_api_list: update comment
Stoiko Ivanov [Fri, 22 Jun 2018 18:21:08 +0000 (20:21 +0200)]
PVE::CLIHandler::print_api_list: update comment

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
12 months agoPVE::CLIHandler::print_api_list - use all occuring properties
Stoiko Ivanov [Fri, 22 Jun 2018 18:21:07 +0000 (20:21 +0200)]
PVE::CLIHandler::print_api_list - use all occuring properties

print_api_list falls back to the union of all properties occuring in data, if
none are provided explicitly, and the API method contains no returns property.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
12 months agoPVE::CLIHandler::print_text_table - fix sorting
Stoiko Ivanov [Fri, 22 Jun 2018 18:21:06 +0000 (20:21 +0200)]
PVE::CLIHandler::print_text_table - fix sorting

Sort only if at least one column contains no undefined values.
Sort according to the left-most such column.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
12 months agocleanup: rename $returninfo to $result_schema
Dietmar Maurer [Fri, 22 Jun 2018 05:37:09 +0000 (07:37 +0200)]
cleanup: rename $returninfo to $result_schema

12 months agoPVE::CLIHandler::print_api_list - improve format check
Dietmar Maurer [Fri, 22 Jun 2018 05:18:41 +0000 (07:18 +0200)]
PVE::CLIHandler::print_api_list - improve format check

We can only print lists of objects.

12 months agoPVE::CLIHandler::print_api_list - reorder arguments
Dietmar Maurer [Fri, 22 Jun 2018 05:14:04 +0000 (07:14 +0200)]
PVE::CLIHandler::print_api_list - reorder arguments

Move optional argument to the end.

12 months agoPVE::CLIHandler::print_api_list - allow to pass empty $props_to_print
Dietmar Maurer [Fri, 22 Jun 2018 05:12:42 +0000 (07:12 +0200)]
PVE::CLIHandler::print_api_list - allow to pass empty $props_to_print