X-Git-Url: https://git.proxmox.com/?p=pve-client.git;a=blobdiff_plain;f=PVE%2FAPIClient%2FCommands%2Fremote.pm;h=0f465eac489a49753b77112e2824d02fbe42a142;hp=c9e0e622a032f295948a9e978e2311d7c15c5578;hb=654a262843b28140f4b3dc6e10e6b6447f95e27f;hpb=f79acf69e705e35f0eac8b1b3f4fa77a129c5514

diff --git a/PVE/APIClient/Commands/remote.pm b/PVE/APIClient/Commands/remote.pm
index c9e0e62..0f465ea 100644
--- a/PVE/APIClient/Commands/remote.pm
+++ b/PVE/APIClient/Commands/remote.pm
@@ -3,7 +3,8 @@ package PVE::APIClient::Commands::remote;
 use strict;
 use warnings;
 
-use PVE::JSONSchema qw(register_standard_option get_standard_option);
+use PVE::JSONSchema qw(get_standard_option);
+use PVE::Tools qw(extract_param);
 use PVE::APIClient::Config;
 
 use PVE::CLIHandler;
@@ -13,19 +14,6 @@ use PVE::PTY ();
 
 use base qw(PVE::CLIHandler);
 
-my $complete_remote_name = sub {
-
-    my $config = PVE::APIClient::Config->new();
-    return $config->remote_names;
-};
-
-register_standard_option('pveclient-remote-name', {
-    description => "The name of the remote.",
-    type => 'string',
-    pattern => qr(\w+),
-    completion => $complete_remote_name,
-});
-
 sub read_password {
    return PVE::PTY::read_password("Remote password: ")
 }
@@ -40,14 +28,14 @@ __PACKAGE__->register_method ({
     },
     returns => { type => 'null' },
     code => sub {
-	my $config = PVE::APIClient::Config->new();
-	my $known_remotes = $config->remote_names;
+	my $config = PVE::APIClient::Config->load();
 
 	printf("%10s %10s %10s %10s %100s\n", "Name", "Host", "Port", "Username", "Fingerprint");
-	for my $name (@$known_remotes) {
-	    my $remote = $config->lookup_remote($name);
-	    printf("%10s %10s %10s %10s %100s\n", $name, $remote->{'host'},
-		$remote->{'port'}, $remote->{'username'}, $remote->{'fingerprint'});
+	for my $name (keys %{$config->{ids}}) {
+	    my $data = $config->{ids}->{$name};
+	    next if $data->{type} ne 'remote';
+	    printf("%10s %10s %10s %10s %100s\n", $name, $data->{'host'},
+		   $data->{'port'} // '-', $data->{'username'}, $data->{'fingerprint'} // '-');
 	}
 
 	return undef;
@@ -58,59 +46,99 @@ __PACKAGE__->register_method ({
     path => 'add',
     method => 'POST',
     description => "Add a remote to your config file.",
-    parameters => {
-	additionalProperties => 0,
-	properties => {
-	    name => get_standard_option('pveclient-remote-name', { completion => sub {} }),
-	    host => {
-		description => "The host.",
-		type => 'string',
-		format => 'address',
-	    },
-	    username => {
-		description => "The username.",
-		type => 'string',
-	    },
-	    password => {
-		description => "The users password",
-		type => 'string',
-	    },
-	    port => {
-		description => "The port",
-		type => 'integer',
-		optional => 1,
-		default => 8006,
-	    }
-	},
-    },
+    parameters => PVE::APIClient::RemoteConfig->createSchema(1),
     returns => { type => 'null'},
     code => sub {
 	my ($param) = @_;
 
-	my $config = PVE::APIClient::Config->new();
-	my $known_remotes = $config->remotes;
+	# fixme: lock config file
 
-	if (exists($known_remotes->{$param->{name}})) {
-	    die "Remote \"$param->{name}\" exists, remove it first\n";
-	}
+	my $remote = $param->{name};
+
+	my $config = PVE::APIClient::Config->load();
+
+	die "Remote '$remote' already exists\n"
+	    if $config->{ids}->{$remote};
 
 	my $last_fp = 0;
-	my $api = PVE::APIClient::LWP->new(
+
+	my $password = $param->{password};
+	if (!defined($password)) {
+	    $password = PVE::PTY::read_password("Remote password: ");
+	}
+
+	my $setup = {
 	    username                => $param->{username},
-	    password                => $param->{password},
+	    password                => $password,
 	    host                    => $param->{host},
 	    port                    => $param->{port} // 8006,
-	    manual_verification     => 1,
-	    register_fingerprint_cb => sub {
+	};
+
+	if ($param->{fingerprint}) {
+	    $setup->{cached_fingerprints} = {
+		$param->{fingerprint} => 1,
+	    };
+	} else {
+	    $setup->{manual_verification} = 1;
+	    $setup->{register_fingerprint_cb} = sub {
 		my $fp = shift @_;
 		$last_fp = $fp;
-	    },
-	);
+	    };
+	}
+
+	my $api = PVE::APIClient::LWP->new(%$setup);
 	$api->login();
 
-	$config->add_remote($param->{name}, $param->{host}, $param->{port} // 8006, 
-			    $last_fp, $param->{username}, $param->{password});
-	$config->save;
+	$param->{fingerprint} = $last_fp if !defined($param->{fingerprint});
+	my $plugin = PVE::APIClient::Config->lookup('remote');
+	my $opts = $plugin->check_config($remote, $param, 1, 1);
+	$config->{ids}->{$remote} = $opts;
+
+	PVE::APIClient::Config->save($config);
+
+	return undef;
+    }});
+
+__PACKAGE__->register_method ({
+    name => 'update',
+    path => 'update',
+    method => 'PUT',
+    description => "Update a remote configuration.",
+    parameters => PVE::APIClient::RemoteConfig->updateSchema(1),
+    returns => { type => 'null'},
+    code => sub {
+	my ($param) = @_;
+
+	# fixme: lock config file
+
+	my $name = extract_param($param, 'name');
+	my $digest = extract_param($param, 'digest');
+	my $delete = extract_param($param, 'delete');
+
+	my $config = PVE::APIClient::Config->load();
+	my $remote = PVE::APIClient::Config->lookup_remote($config, $name);
+
+	my $plugin = PVE::APIClient::Config->lookup('remote');
+	my $opts = $plugin->check_config($name, $param, 0, 1);
+
+	foreach my $k (%$opts) {
+	    $remote->{$k} = $opts->{$k};
+	}
+
+	if ($delete) {
+	    my $options = $plugin->private()->{options}->{'remote'};
+	    foreach my $k (PVE::Tools::split_list($delete)) {
+		my $d = $options->{$k} ||
+		    die "no such option '$k'\n";
+		die "unable to delete required option '$k'\n"
+		    if !$d->{optional};
+		die "unable to delete fixed option '$k'\n"
+		    if $d->{fixed};
+		delete $remote->{$k};
+	    }
+	}
+
+	PVE::APIClient::Config->save($config);
 
 	return undef;
     }});
@@ -130,15 +158,18 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
-	my $config = PVE::APIClient::Config->new();
-	$config->remove_remote($param->{name});
-	$config->save;
+	# fixme: lock config
+
+	my $config = PVE::APIClient::Config->load();
+	delete $config->{ids}->{$param->{name}};
+	PVE::APIClient::Config->save($config);
 
 	return undef;
     }});
 
 our $cmddef = {
     add => [ __PACKAGE__, 'add', ['name', 'host', 'username']],
+    update => [ __PACKAGE__, 'update', ['name']],
     remove => [ __PACKAGE__, 'remove', ['name']],
     list => [__PACKAGE__, 'list'],
 };