X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=pveclient;h=a7e41efea3f740743d09d5741d64085e62c2ae3d;hb=b0495d825b1b1e5c83a006d68293e89c98eaa024;hp=46d902daca0952866eba0360d6d96e7ad9b14758;hpb=db278c3dd235f14c6ba48350f6dde4e34e91a183;p=pve-client.git diff --git a/pveclient b/pveclient index 46d902d..a7e41ef 100755 --- a/pveclient +++ b/pveclient @@ -1,94 +1,50 @@ #!/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::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) = @_; + my ($remote, $path, $method, $param) = @_; die "missing API path\n" if !defined($path); + 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 $cli_class_handlers = { - lxc => 'PVE::APIClient::Commands::lxc', - remote => 'PVE::APIClient::Commands::remote', - help => 'PVE::APIClient::Commands::help', -}; + my $res = $conn->call($method, "api2/json/$path", $param); + die "undefined result" if !defined($res); + die "undefined result data" if !exists($res->{data}); -my $cmd = shift; -if (!defined($cmd)) { - PVE::APIClient::Commands::help->help({}); - exit(-1); + return $res->{data}; } -if ($cmd eq 'get') { - my $method = 'GET'; - my $path; - if (scalar(@ARGV) && $ARGV[0] !~ m/^\-/) { - $path = shift @ARGV; - } - my $res = call_method($path, $method, \@ARGV); - die "implement me"; -} elsif ($cmd eq 'set') { - die "implement me"; -} elsif ($cmd eq 'create') { - die "implement me"; -} elsif ($cmd eq 'delete') { - 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"; - $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/$cur$//; - - my $args = PVE::Tools::split_args($cmdline); - - my @cmds = ('get', 'set', 'create', 'delete', keys %$cli_class_handlers); - if (scalar(@$args) == 1) { - foreach my $p (@cmds) { - print "$p\n" if $p =~ m/^$cur/; - } - } - } +use base qw(PVE::APIClient::CLIHandler); + +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; @@ -106,8 +62,133 @@ if ($cmd eq 'get') { } } print join("\n", sort(keys %$packages)) . "\n"; -} else { - PVE::APIClient::Commands::help->help({}); + + exit(0); } -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}; +} + +$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, $format) = @_; + + return if $path_returns->{type} eq 'null'; + + # TODO: implement different output formats ($format) + print to_json($data, {utf8 => 1, allow_nonref => 1, canonical => 1, pretty => 1 }); +}; + +__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) = @_; + + my $path = PVE::Tools::extract_param($param, 'api_path'); + my $remote = PVE::Tools::extract_param($param, 'remote'); + + return call_method($remote, $path, '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) = @_; + + print Dumper($param); + + die "implement me"; + + }}); + +__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) = @_; + + print Dumper($param); + + die "implement me"; + + }}); + +__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) = @_; + + print Dumper($param); + + die "implement me"; + + }}); + + +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, + + spice => [ 'PVE::APIClient::Commands::GuestStatus', 'spice', ['remote', 'vmid']], + start => [ 'PVE::APIClient::Commands::GuestStatus', 'start', ['remote', 'vmid']], + stop => [ 'PVE::APIClient::Commands::GuestStatus', 'stop', ['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();