X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=pveclient;h=34e2aab8b1b14028e534bc0024cf8420ad529fa1;hp=52f40a7afdec61a405bd32caf1328de3f39154c5;hb=0ca370283dcfe778a1ff2473e4952dbf13a40683;hpb=f7b8bab772851b5c307a9e9be0bc00c62053dfd1 diff --git a/pveclient b/pveclient index 52f40a7..34e2aab 100755 --- a/pveclient +++ b/pveclient @@ -1,115 +1,63 @@ #!/usr/bin/perl +package PVE::CLI::pveclient; + use strict; use warnings; use Cwd 'abs_path'; -use lib '/usr/share/pve-client'; -use lib '.'; use Data::Dumper; -use PVE::JSONSchema; -use PVE::CLIHandler; +use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option); +use PVE::APIClient::CLIHandler; +use PVE::APIClient::PTY; use PVE::APIClient::LWP; use PVE::APIClient::Helpers; +use PVE::APIClient::Config; +use PVE::APIClient::Commands::config; use PVE::APIClient::Commands::remote; use PVE::APIClient::Commands::list; use PVE::APIClient::Commands::lxc; -use PVE::APIClient::Commands::help; +use PVE::APIClient::Commands::GuestStatus; use JSON; -sub call_method { - my ($path, $method, $args) = @_; +sub call_api_method { + my ($method, $param) = @_; + my $path = PVE::APIClient::Tools::extract_param($param, 'api_path'); die "missing API path\n" if !defined($path); + my $remote = PVE::APIClient::Tools::extract_param($param, 'remote'); + die "missing remote\n" if !defined($remote); + + my $format = PVE::APIClient::Tools::extract_param($param, 'format'); + PVE::APIClient::Helpers::set_output_format($format); + + my $config = PVE::APIClient::Config->load(); + + # test if api path exists my $info = PVE::APIClient::Helpers::lookup_api_method($path, $method); - my $param = PVE::JSONSchema::get_options($info->{parameters}, $args); - print Dumper($param); - die "implement me"; -} + my $conn = PVE::APIClient::Config->remote_conn($config, $remote); + my $res = $conn->call($method, "api2/json/$path", $param); + die "undefined result" if !defined($res); + die "undefined result data" if !exists($res->{data}); -my $cli_class_handlers = { - list => 'PVE::APIClient::Commands::list', - lxc => 'PVE::APIClient::Commands::lxc', - remote => 'PVE::APIClient::Commands::remote', - help => 'PVE::APIClient::Commands::help', -}; + return $res->{data}; +} -my $cmd = shift; -if (!defined($cmd)) { - PVE::APIClient::Commands::help->help({}); - exit(-1); +use base qw(PVE::APIClient::CLIHandler); + +sub read_password { + return PVE::APIClient::PTY::read_password("Remote password: ") } -my $method_map = { - create => 'POST', - set => 'PUT', - get => 'GET', - delete => 'DELETE', -}; -if (my $method = $method_map->{$cmd}) { - my $path; - if (scalar(@ARGV) && $ARGV[0] !~ m/^\-/) { - $path = shift @ARGV; - } - my $res = call_method($path, $method, \@ARGV); - die "implement me"; -} elsif (my $class = $cli_class_handlers->{$cmd}) { - $class->run_cli_handler(); -} elsif ($cmd eq 'bashcomplete') { - - exit(0) if !(defined($ENV{COMP_LINE}) && defined($ENV{COMP_POINT})); - - my $cmdlist = join('|', keys %$cli_class_handlers); - if ($ENV{COMP_LINE} =~ m/^(.*pveclient\s+($cmdlist)\s+)(.*)$/) { - my $cmd = $2; - my $class = $cli_class_handlers->{$cmd} || die "internal error"; - - if ($cmd eq 'list') { # simple commands - $ENV{COMP_LINE} = "pveclient $3"; - $ENV{COMP_POINT} = length($ENV{COMP_LINE}); - @ARGV = ('bashcomplete', 'pveclient', $ARGV[1], $ARGV[2]); - } else { - $ENV{COMP_LINE} = "pveclient $3"; - $ENV{COMP_POINT} = length($ENV{COMP_LINE}); - @ARGV = ('bashcomplete', 'pveclient', $ARGV[1], $ARGV[2]); - } - $class->run_cli_handler(); - - } else { - - my $cmdline = substr($ENV{COMP_LINE}, 0, $ENV{COMP_POINT}); - my ($bash_command, $cur, $prev) = @ARGV; - $cmdline =~ s/\Q$cur\E$//; - - my $args = PVE::Tools::split_args($cmdline); - - my @cmds = (keys %$method_map, keys %$cli_class_handlers); - if (scalar(@$args) == 1) { - foreach my $p (@cmds) { - print "$p\n" if $p =~ m/^$cur/; - } - } elsif (scalar(@$args) == 2) { - if (my $method = $method_map->{$args->[1]}) { - PVE::APIClient::Helpers::complete_api_path($cur); - } - } elsif (scalar(@$args) >= 3) { - my $path = $args->[2]; - if (my $method = $method_map->{$args->[1]}) { - if (my $info = PVE::APIClient::Helpers::lookup_api_method($path, $method, 1)) { - my $prop = $info->{parameters}->{properties}; - PVE::APIClient::Helpers::complete_api_call_options($method, $prop, $prev, $cur, $args); - } - } - } - } +my $cmd = $ARGV[0]; -} elsif ($cmd eq 'packagedepends') { +if ($cmd && $cmd eq 'packagedepends') { # experimental code to print required perl packages my $packages = {}; my $dir = Cwd::getcwd; @@ -127,8 +75,123 @@ if (my $method = $method_map->{$cmd}) { } } print join("\n", sort(keys %$packages)) . "\n"; -} else { - PVE::APIClient::Commands::help->help({}); + + exit(0); +} + +my $path_properties = {}; +my $path_returns = { type => 'null' }; + +# dynamically update schema definition for direct API call +# like: pveclient api +if (my $info = PVE::APIClient::Helpers::extract_path_info()) { + $path_properties = $info->{parameters}->{properties}; + $path_returns = $info->{returns}; } -exit(0); +$path_properties->{format} = get_standard_option('pveclient-output-format'), +$path_properties->{remote} = get_standard_option('pveclient-remote-name'); +$path_properties->{api_path} = { + description => "API path.", + type => 'string', + completion => sub { + my ($cmd, $pname, $cur, $args) = @_; + return PVE::APIClient::Helpers::complete_api_path($cur); + }, +}; + + +my $format_result = sub { + my ($data) = @_; + + PVE::APIClient::Helpers::print_result($data, $path_returns); +}; + +__PACKAGE__->register_method ({ + name => 'pveclient_get', + path => 'pveclient_get', + method => 'GET', + description => "call API GET on .", + parameters => { + additionalProperties => 0, + properties => $path_properties, + }, + returns => $path_returns, + code => sub { + my ($param) = @_; + + return call_api_method('GET', $param); + }}); + +__PACKAGE__->register_method ({ + name => 'pveclient_set', + path => 'pveclient_set', + method => 'PUT', + description => "call API PUT on .", + parameters => { + additionalProperties => 0, + properties => $path_properties, + }, + returns => $path_returns, + code => sub { + my ($param) = @_; + + return call_api_method('PUT', $param); + }}); + +__PACKAGE__->register_method ({ + name => 'pveclient_create', + path => 'pveclient_create', + method => 'PUSH', + description => "call API PUSH on .", + parameters => { + additionalProperties => 0, + properties => $path_properties, + }, + returns => $path_returns, + code => sub { + my ($param) = @_; + + return call_api_method('PUSH', $param); + }}); + +__PACKAGE__->register_method ({ + name => 'pveclient_delete', + path => 'pveclient_delete', + method => 'DELETE', + description => "call API DELETE on .", + parameters => { + additionalProperties => 0, + properties => $path_properties, + }, + returns => $path_returns, + code => sub { + my ($param) = @_; + + return call_api_method('DELETE', $param); + }}); + + +our $cmddef = { + config => $PVE::APIClient::Commands::config::cmddef, + list => $PVE::APIClient::Commands::list::cmddef, + lxc => $PVE::APIClient::Commands::lxc::cmddef, + remote => $PVE::APIClient::Commands::remote::cmddef, + + resume => [ 'PVE::APIClient::Commands::GuestStatus', 'resume', ['remote', 'vmid']], + shutdown => [ 'PVE::APIClient::Commands::GuestStatus', 'shutdown', ['remote', 'vmid']], + spice => [ 'PVE::APIClient::Commands::GuestStatus', 'spice', ['remote', 'vmid']], + start => [ 'PVE::APIClient::Commands::GuestStatus', 'start', ['remote', 'vmid']], + stop => [ 'PVE::APIClient::Commands::GuestStatus', 'stop', ['remote', 'vmid']], + suspend => [ 'PVE::APIClient::Commands::GuestStatus', 'suspend', ['remote', 'vmid']], + + api => { + get => [ __PACKAGE__, 'pveclient_get', ['remote', 'api_path'], {}, $format_result ], + set => [ __PACKAGE__, 'pveclient_set', ['remote', 'api_path'], {}, $format_result ], + create => [ __PACKAGE__, 'pveclient_create', ['remote', 'api_path'], {}, $format_result ], + delete => [ __PACKAGE__, 'pveclient_delete', ['remote', 'api_path'], {}, $format_result ], + }, +}; + + +__PACKAGE__->run_cli_handler();