X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=pveclient;h=cbcc113778ed75611be6baf7248df2cbaa257575;hp=8ef37a94b467ff7aae1601bf10a69cec3460c0f2;hb=fabf76a653193b007f2c4ecda29ff1067b6e971a;hpb=2f964a751cc71d669bc03df031a147eebc8ebe35;ds=sidebyside

diff --git a/pveclient b/pveclient
index 8ef37a9..cbcc113 100755
--- a/pveclient
+++ b/pveclient
@@ -5,36 +5,59 @@ 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 qw(register_standard_option get_standard_option);
-use PVE::CLIHandler;
+use PVE::APIClient::JSONSchema qw(register_standard_option get_standard_option);
+use PVE::APIClient::RESTHandler;
+use PVE::APIClient::CLIFormatter;
+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::start;
+use PVE::APIClient::Commands::GuestStatus;
 
 use JSON;
 
-sub call_method {
-    my ($remote, $path, $method, $params) = @_;
+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 $info = PVE::APIClient::Helpers::lookup_api_method($path, $method);
-    print Dumper($params);
+    my $stdopts = PVE::APIClient::RESTHandler::extract_standard_output_properties($param);
+    PVE::APIClient::CLIFormatter::query_terminal_options($stdopts);
 
-    die "implement me";
+    my $remote = PVE::APIClient::Tools::extract_param($param, 'remote');
+    die "missing remote\n" if !defined($remote);
+
+    my $config = PVE::APIClient::Config->load();
+
+    my $uri_param = {};
+    my $info = PVE::APIClient::Helpers::find_method_info($path, $method, $uri_param);
+
+    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 $data = $res->{data};
+
+    PVE::APIClient::CLIFormatter::print_api_result($data, $info->{returns}, undef, $stdopts);
+}
+
+use base qw(PVE::APIClient::CLIHandler);
+
+sub read_password {
+    return PVE::APIClient::PTY::read_password("Remote password: ")
 }
 
-use base qw(PVE::CLIHandler);
 
 my $cmd = $ARGV[0];
 
@@ -61,17 +84,8 @@ if ($cmd && $cmd eq 'packagedepends') {
 }
 
 my $path_properties = {};
-my $path_returns = { type => 'null' };
 
-# dynamically update schema definition for direct API call
-# like: pveclient api <get|set|create|delete|help> <remote> <path>
-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} = {
+my $api_path_property = {
     description => "API path.",
     type => 'string',
     completion => sub {
@@ -80,98 +94,187 @@ $path_properties->{api_path} = {
     },
 };
 
+# dynamically update schema definition for direct API call
+# like: pveclient api <get|set|create|delete|help> <remote> <path>
+my $uri_param = {};
+if (my $info = PVE::APIClient::Helpers::extract_path_info($uri_param)) {
+    foreach my $key (keys %{$info->{parameters}->{properties}}) {
+	next if defined($uri_param->{$key});
+	$path_properties->{$key} = $info->{parameters}->{properties}->{$key};
+    }
+}
+
+$path_properties->{remote} = get_standard_option('pveclient-remote-name');
+$path_properties->{api_path} = $api_path_property;
+
 __PACKAGE__->register_method ({
     name => 'pveclient_get',
     path => 'pveclient_get',
     method => 'GET',
-    description => "call API GET on <path>.",
+    description => "Call API GET on <api_path>.",
     parameters => {
 	additionalProperties => 0,
-	properties => $path_properties,
+	properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
     },
-    returns => $path_returns,
+    returns => { type => 'null' },
     code => sub {
 	my ($param) = @_;
 
-	my $path = PVE::Tools::extract_param($param, 'api_path');
-	my $remote = PVE::Tools::extract_param($param, 'remote');
+	call_api_method('GET', $param);
 
-	return call_method($remote, $path, 'GET', $param);
+	return undef;
     }});
 
 __PACKAGE__->register_method ({
     name => 'pveclient_set',
     path => 'pveclient_set',
     method => 'PUT',
-    description => "call API PUT on <path>.",
+    description => "Call API PUT on <api_path>.",
     parameters => {
 	additionalProperties => 0,
-	properties => $path_properties,
+	properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
     },
-    returns => $path_returns,
+    returns => { type => 'null' },
     code => sub {
 	my ($param) = @_;
 
-	print Dumper($param);
-
-	die "implement me";
+	call_api_method('PUT', $param);
 
+	return undef;
     }});
 
 __PACKAGE__->register_method ({
     name => 'pveclient_create',
     path => 'pveclient_create',
-    method => 'PUSH',
-    description => "call API PUSH on <path>.",
+    method => 'POST',
+    description => "Call API POST on <api_path>.",
     parameters => {
 	additionalProperties => 0,
-	properties => $path_properties,
+	properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
     },
-    returns => $path_returns,
+    returns => { type => 'null' },
     code => sub {
 	my ($param) = @_;
 
-	print Dumper($param);
-
-	die "implement me";
+	call_api_method('PUSH', $param);
 
+	return undef;
     }});
 
 __PACKAGE__->register_method ({
     name => 'pveclient_delete',
     path => 'pveclient_delete',
     method => 'DELETE',
-    description => "call API DELETE on <path>.",
+    description => "Call API DELETE on <api_path>.",
     parameters => {
 	additionalProperties => 0,
-	properties => $path_properties,
+	properties => PVE::APIClient::RESTHandler::add_standard_output_properties($path_properties),
     },
-    returns => $path_returns,
+    returns => { type => 'null' },
     code => sub {
 	my ($param) = @_;
 
-	print Dumper($param);
-
-	die "implement me";
+	call_api_method('DELETE', $param);
 
+	return undef;
     }});
 
+__PACKAGE__->register_method ({
+    name => 'pveclient_usage',
+    path => 'pveclient_usage',
+    method => 'GET',
+    description => "print API usage information for <api_path>.",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    api_path => $api_path_property,
+	    verbose => {
+		description => "Verbose output format.",
+		type => 'boolean',
+		optional => 1,
+	    },
+	    returns => {
+		description => "Including schema for returned data.",
+		type => 'boolean',
+		optional => 1,
+	    },
+	    command => {
+		description => "API command.",
+		type => 'string',
+		enum => [ keys %$PVE::APIClient::Helpers::method_map ],
+		optional => 1,
+	    },
+	},
+    },
+    returns => { type => 'null' },
+    code => sub {
+	my ($param) = @_;
+
+	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 = $PVE::APIClient::Helpers::method_map->{$cmd};
+	    my $uri_param = {};
+	    my $info = PVE::APIClient::Helpers::find_method_info($path, $method, $uri_param, 1);
+	    next if !$info;
+	    $found = 1;
+
+	    my $prefix = "pveclient api $cmd <remote> $path";
+	    if ($param->{verbose}) {
+		print PVE::APIClient::RESTHandler::getopt_usage(
+		    $info, $prefix, undef, $uri_param, 'full');
+
+	    } else {
+		print "USAGE: " . PVE::APIClient::RESTHandler::getopt_usage(
+		    $info, $prefix, undef, $uri_param, 'short');
+	    }
+	    if ($param-> {returns}) {
+		my $schema = to_json($info->{returns}, {utf8 => 1, canonical => 1, pretty => 1 });
+		print "RETURNS: $schema\n";
+	    }
+	}
+
+	if (!$found) {
+	    if ($param->{command}) {
+		die "no '$param->{command}' handler for '$path'\n";
+	    } else {
+		die "no such resource '$path'\n"
+	    }
+	}
+
+	return undef;
+    }});
 
 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,
-    
-    start => $PVE::APIClient::Commands::start::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 => {
+	usage => [ __PACKAGE__, 'pveclient_usage', ['api_path']],
 	get => [ __PACKAGE__, 'pveclient_get', ['remote', 'api_path']],
 	set => [ __PACKAGE__, 'pveclient_set', ['remote', 'api_path']],
 	create => [ __PACKAGE__, 'pveclient_create', ['remote', 'api_path']],
 	delete => [ __PACKAGE__, 'pveclient_delete', ['remote', 'api_path']],
-    }
+    },
 };
 
 
+if ($cmd && $cmd eq 'printsynopsis') {
+
+    print __PACKAGE__->generate_asciidoc_synopsis();
+
+    exit(0);
+}
+
 __PACKAGE__->run_cli_handler();