proxmox-mirrors/pve-client
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-client synced 2025-10-04 19:01:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes for changes in pve-common

Browse Source
This commit is contained in:
Dietmar Maurer 2018-07-25 10:50:29 +02:00
parent a00bef992d
commit 4aba8d31fe
5 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/APIClient/Commands/config.pm
View File

@ -10,6 +10,7 @@ use PVE::APIClient::Tools qw(extract_param);
use PVE::APIClient::Config; use PVE::APIClient::Config;
use PVE::APIClient::CLIFormatter; use PVE::APIClient::CLIFormatter;
use PVE::APIClient::RESTHandler;
use PVE::APIClient::CLIHandler; use PVE::APIClient::CLIHandler;
use base qw(PVE::APIClient::CLIHandler); use base qw(PVE::APIClient::CLIHandler);
@ -96,8 +97,10 @@ our $cmddef = {
sub { sub {
my ($data, $schema, $options) = @_; my ($data, $schema, $options) = @_;
PVE::APIClient::CLIFormatter::query_terminal_options($options);
PVE::APIClient::CLIFormatter::print_api_result($data, $schema, undef, $options); PVE::APIClient::CLIFormatter::print_api_result($data, $schema, undef, $options);
} },
$PVE::APIClient::RESTHandler::standard_output_options,
], ],
}; };

9
PVE/APIClient/Commands/list.pm
View File

@ -25,7 +25,7 @@ __PACKAGE__->register_method ({
name => 'list', name => 'list',
path => 'list', path => 'list',
method => 'GET', method => 'GET',
description => "List containers.", description => "List VMs and Containers.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
@ -49,9 +49,12 @@ __PACKAGE__->register_method ({
}}); }});
our $cmddef = [ __PACKAGE__, 'list', ['remote'], {}, sub { our $cmddef = [ __PACKAGE__, 'list', ['remote'], {},
sub {
my ($data, $schema, $options) = @_; my ($data, $schema, $options) = @_;
PVE::APIClient::Helpers::print_ordered_result($list_returns_properties, $data, $schema, $options); PVE::APIClient::Helpers::print_ordered_result($list_returns_properties, $data, $schema, $options);
}]; },
$PVE::APIClient::RESTHandler::standard_output_options,
];
1; 1;

7
PVE/APIClient/Commands/remote.pm
View File

@ -206,10 +206,13 @@ our $cmddef = {
add => [ __PACKAGE__, 'remote_add', ['name', 'host', 'username']], add => [ __PACKAGE__, 'remote_add', ['name', 'host', 'username']],
set => [ __PACKAGE__, 'remote_set', ['name']], set => [ __PACKAGE__, 'remote_set', ['name']],
delete => [ __PACKAGE__, 'remote_delete', ['name']], delete => [ __PACKAGE__, 'remote_delete', ['name']],
list => [__PACKAGE__, 'remote_list', undef, {}, sub { list => [__PACKAGE__, 'remote_list', undef, {},
sub {
my ($data, $schema, $options) = @_; my ($data, $schema, $options) = @_;
PVE::APIClient::Helpers::print_ordered_result($remote_list_returns_properties, $data, $schema, $options); PVE::APIClient::Helpers::print_ordered_result($remote_list_returns_properties, $data, $schema, $options);
}], },
$PVE::APIClient::RESTHandler::standard_output_options,
],
}; };
1; 1;

1
PVE/APIClient/Helpers.pm
View File

@ -392,6 +392,7 @@ sub print_ordered_result {
my $param_order = extract_even_elements($property_list); my $param_order = extract_even_elements($property_list);
PVE::APIClient::CLIFormatter::query_terminal_options($options);
PVE::APIClient::CLIFormatter::print_api_result($data, $result_schema, $param_order, $options); PVE::APIClient::CLIFormatter::print_api_result($data, $result_schema, $param_order, $options);
} }

67
pveclient
View File

@ -8,6 +8,7 @@ use Cwd 'abs_path';
use Data::Dumper; use Data::Dumper;
use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option); use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option);
use PVE::APIClient::RESTHandler;
use PVE::APIClient::CLIFormatter; use PVE::APIClient::CLIFormatter;
use PVE::APIClient::CLIHandler; use PVE::APIClient::CLIHandler;
use PVE::APIClient::PTY; use PVE::APIClient::PTY;
@ -24,11 +25,14 @@ use PVE::APIClient::Commands::GuestStatus;
use JSON; use JSON;
sub call_api_method { sub call_api_method {
my ($method, $param, $options) = @_; my ($method, $param) = @_;
my $path = PVE::APIClient::Tools::extract_param($param, 'api_path'); my $path = PVE::APIClient::Tools::extract_param($param, 'api_path');
die "missing API path\n" if !defined($path); die "missing API path\n" if !defined($path);
my $stdopts = PVE::APIClient::RESTHandler::extract_standard_output_properties($param);
PVE::APIClient::CLIFormatter::query_terminal_options($stdopts);
my $remote = PVE::APIClient::Tools::extract_param($param, 'remote'); my $remote = PVE::APIClient::Tools::extract_param($param, 'remote');
die "missing remote\n" if !defined($remote); die "missing remote\n" if !defined($remote);
@ -43,7 +47,9 @@ sub call_api_method {
die "undefined result" if !defined($res); die "undefined result" if !defined($res);
die "undefined result data" if !exists($res->{data}); die "undefined result data" if !exists($res->{data});
return $res->{data}; my $data = $res->{data};
PVE::APIClient::CLIFormatter::print_api_result($data, $info->{returns}, undef, $stdopts);
} }
use base qw(PVE::APIClient::CLIHandler); use base qw(PVE::APIClient::CLIHandler);
@ -78,7 +84,6 @@ if ($cmd && $cmd eq 'packagedepends') {
} }
my $path_properties = {}; my $path_properties = {};
my $path_returns = { type => 'null' };
my $api_path_property = { my $api_path_property = {
description => "API path.", description => "API path.",
@ -97,19 +102,11 @@ if (my $info = PVE::APIClient::Helpers::extract_path_info($uri_param)) {
next if defined($uri_param->{$key}); next if defined($uri_param->{$key});
$path_properties->{$key} = $info->{parameters}->{properties}->{$key}; $path_properties->{$key} = $info->{parameters}->{properties}->{$key};
} }
$path_returns = $info->{returns};
} }
$path_properties->{remote} = get_standard_option('pveclient-remote-name'); $path_properties->{remote} = get_standard_option('pveclient-remote-name');
$path_properties->{api_path} = $api_path_property; $path_properties->{api_path} = $api_path_property;
my $format_result = sub {
my ($data, $schema, $options) = @_;
# NOTE; we need to use $path_returns instead of $schema
PVE::APIClient::CLIFormatter::print_api_result($data, $path_returns, undef, $options);
};
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'pveclient_get', name => 'pveclient_get',
path => 'pveclient_get', path => 'pveclient_get',
@ -117,13 +114,15 @@ __PACKAGE__->register_method ({
description => "Call API GET on <api_path>.", description => "Call API GET on <api_path>.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => $path_properties, properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
}, },
returns => $path_returns, returns => { type => 'null' },
code => sub { code => sub {
my ($param, $options) = @_; my ($param) = @_;
return call_api_method('GET', $param, $options); call_api_method('GET', $param);
return undef;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
@ -133,13 +132,15 @@ __PACKAGE__->register_method ({
description => "Call API PUT on <api_path>.", description => "Call API PUT on <api_path>.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => $path_properties, properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
}, },
returns => $path_returns, returns => { type => 'null' },
code => sub { code => sub {
my ($param, $options) = @_; my ($param) = @_;
return call_api_method('PUT', $param, $options); call_api_method('PUT', $param);
return undef;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
@ -149,13 +150,15 @@ __PACKAGE__->register_method ({
description => "Call API POST on <api_path>.", description => "Call API POST on <api_path>.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => $path_properties, properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
}, },
returns => $path_returns, returns => { type => 'null' },
code => sub { code => sub {
my ($param, $options) = @_; my ($param) = @_;
return call_api_method('PUSH', $param, $options); call_api_method('PUSH', $param);
return undef;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
@ -165,13 +168,15 @@ __PACKAGE__->register_method ({
description => "Call API DELETE on <api_path>.", description => "Call API DELETE on <api_path>.",
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => $path_properties, properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
}, },
returns => $path_returns, returns => { type => 'null' },
code => sub { code => sub {
my ($param, $options) = @_; my ($param) = @_;
return call_api_method('DELETE', $param, $options); call_api_method('DELETE', $param);
return undef;
}}); }});
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
@ -257,10 +262,10 @@ our $cmddef = {
api => { api => {
usage => [ __PACKAGE__, 'pveclient_usage', ['api_path']], usage => [ __PACKAGE__, 'pveclient_usage', ['api_path']],
get => [ __PACKAGE__, 'pveclient_get', ['remote', 'api_path'], {}, $format_result ], get => [ __PACKAGE__, 'pveclient_get', ['remote', 'api_path']],
set => [ __PACKAGE__, 'pveclient_set', ['remote', 'api_path'], {}, $format_result ], set => [ __PACKAGE__, 'pveclient_set', ['remote', 'api_path']],
create => [ __PACKAGE__, 'pveclient_create', ['remote', 'api_path'], {}, $format_result ], create => [ __PACKAGE__, 'pveclient_create', ['remote', 'api_path']],
delete => [ __PACKAGE__, 'pveclient_delete', ['remote', 'api_path'], {}, $format_result ], delete => [ __PACKAGE__, 'pveclient_delete', ['remote', 'api_path']],
}, },
}; };