X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=pveclient;h=09e308657e4494bf4501a1bc8c286ea033d60559;hp=d13b7eb685001153d305999f4f1d65b408b6c4a3;hb=936c07ece1ca26ffd5b762191cd0a97e3fd8815e;hpb=2767c2b92faad106cc412c16741ed5b5ca00b61f diff --git a/pveclient b/pveclient index d13b7eb..09e3086 100755 --- a/pveclient +++ b/pveclient @@ -8,6 +8,7 @@ use Cwd 'abs_path'; use Data::Dumper; use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option); +use PVE::APIClient::CLIFormatter; use PVE::APIClient::CLIHandler; use PVE::APIClient::PTY; @@ -51,7 +52,7 @@ sub call_api_method { use base qw(PVE::APIClient::CLIHandler); sub read_password { - return PVE::APIClient::PTY::read_password("Remote password: ") + return PVE::APIClient::PTY::read_password("Remote password: ") } @@ -93,7 +94,7 @@ if (my $info = PVE::APIClient::Helpers::extract_path_info($uri_param)) { $path_returns = $info->{returns}; } -$path_properties->{format} = get_standard_option('pveclient-output-format'), +$path_properties->{format} = get_standard_option('pve-output-format'), $path_properties->{remote} = get_standard_option('pveclient-remote-name'); $path_properties->{api_path} = { description => "API path.", @@ -108,14 +109,18 @@ $path_properties->{api_path} = { my $format_result = sub { my ($data) = @_; - PVE::APIClient::Helpers::print_result($data, $path_returns); + my $format = PVE::APIClient::Helpers::get_output_format(); + + my $options = PVE::APIClient::CLIFormatter::query_terminal_options({}); + + PVE::APIClient::CLIFormatter::print_api_result($format, $data, $path_returns, undef, $options); }; __PACKAGE__->register_method ({ name => 'pveclient_get', path => 'pveclient_get', method => 'GET', - description => "call API GET on .", + description => "Call API GET on .", parameters => { additionalProperties => 0, properties => $path_properties, @@ -131,7 +136,7 @@ __PACKAGE__->register_method ({ name => 'pveclient_set', path => 'pveclient_set', method => 'PUT', - description => "call API PUT on .", + description => "Call API PUT on .", parameters => { additionalProperties => 0, properties => $path_properties, @@ -146,8 +151,8 @@ __PACKAGE__->register_method ({ __PACKAGE__->register_method ({ name => 'pveclient_create', path => 'pveclient_create', - method => 'PUSH', - description => "call API PUSH on .", + method => 'POST', + description => "Call API POST on .", parameters => { additionalProperties => 0, properties => $path_properties, @@ -163,7 +168,7 @@ __PACKAGE__->register_method ({ name => 'pveclient_delete', path => 'pveclient_delete', method => 'DELETE', - description => "call API DELETE on .", + description => "Call API DELETE on .", parameters => { additionalProperties => 0, properties => $path_properties,