X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=pveclient;h=34e2aab8b1b14028e534bc0024cf8420ad529fa1;hp=70db84a1b7b6bfd4fa5fd322c2009552b4d88bfa;hb=0ca370283dcfe778a1ff2473e4952dbf13a40683;hpb=b133a905129381b7c066c216e93adca67654312f

diff --git a/pveclient b/pveclient
index 70db84a..34e2aab 100755
--- a/pveclient
+++ b/pveclient
@@ -5,35 +5,55 @@ 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::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 ($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 $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);
-    print Dumper($params);
 
-    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});
+
+    return $res->{data};
+}
+
+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];
 
@@ -69,6 +89,7 @@ if (my $info =  PVE::APIClient::Helpers::extract_path_info()) {
     $path_returns = $info->{returns};
 }
 
+$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.",
@@ -79,6 +100,13 @@ $path_properties->{api_path} = {
     },
 };
 
+
+my $format_result = sub {
+    my ($data) = @_;
+
+    PVE::APIClient::Helpers::print_result($data, $path_returns);
+};
+
 __PACKAGE__->register_method ({
     name => 'pveclient_get',
     path => 'pveclient_get',
@@ -92,10 +120,7 @@ __PACKAGE__->register_method ({
     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);
+	return call_api_method('GET', $param);
     }});
 
 __PACKAGE__->register_method ({
@@ -111,10 +136,7 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	print Dumper($param);
-
-	die "implement me";
-
+	return call_api_method('PUT', $param);
     }});
 
 __PACKAGE__->register_method ({
@@ -130,10 +152,7 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	print Dumper($param);
-
-	die "implement me";
-
+	return call_api_method('PUSH', $param);
     }});
 
 __PACKAGE__->register_method ({
@@ -149,10 +168,7 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	print Dumper($param);
-
-	die "implement me";
-
+	return call_api_method('DELETE', $param);
     }});
 
 
@@ -162,12 +178,19 @@ our $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']],
-	set => [ __PACKAGE__, 'pveclient_set', ['remote', 'api_path']],
-	create => [ __PACKAGE__, 'pveclient_create', ['remote', 'api_path']],
-	delete => [ __PACKAGE__, 'pveclient_delete', ['remote', 'api_path']],
-    }
+	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 ],
+    },
 };