konevsa/pve-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pvesh usage: correctly handle uri paramaeters, cleanups

Browse Source 
Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
This commit is contained in:
Dietmar Maurer 2018-07-11 11:19:44 +02:00 committed by Wolfgang Bumiller
parent a831f4be80
commit 0e99eead10
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pvesh
View File

@ -364,25 +364,24 @@ __PACKAGE__->register_method ({
code => sub {
my ($param) = @_;
$opt_nooutput = 1; # we print directly
my $path = $param->{api_path};
my $found = 0;
foreach my $cmd (qw(get set create delete)) {
next if $param->{command} && $cmd ne $param->{command};
my $method = $method_map->{$cmd};
my ($handler, $info) = PVE::API2->find_handler($method, $path);
my $uri_param = {};
my ($handler, $info) = PVE::API2->find_handler($method, $path, $uri_param);
next if !$handler;
$found = 1;
if ($param->{verbose}) {
print $handler->usage_str(
$info->{name}, "pvesh $cmd $path", undef, {}, 'full');
$info->{name}, "pvesh $cmd $path", undef, $uri_param, 'full');
} else {
print "USAGE: " . $handler->usage_str(
$info->{name}, "pvesh $cmd $path", undef, {}, 'short');
$info->{name}, "pvesh $cmd $path", undef, $uri_param, 'short');
}
if ($param-> {returns}) {
my $schema = to_json($info->{returns}, {utf8 => 1, canonical => 1, pretty => 1 });
@ -402,7 +401,7 @@ __PACKAGE__->register_method ({
}});
our $cmddef = {
usage => [ __PACKAGE__, 'usage', ['api_path'], {}, $format_result ],
usage => [ __PACKAGE__, 'usage', ['api_path']],
get => [ __PACKAGE__, 'get', ['api_path'], {}, $format_result ],
set => [ __PACKAGE__, 'set', ['api_path'], {}, $format_result ],
create => [ __PACKAGE__, 'create', ['api_path'], {}, $format_result ],