From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 5610D69F0E for ; Mon, 16 Nov 2020 12:02:02 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4EB0E2DACF for ; Mon, 16 Nov 2020 12:01:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B519F2DAB2 for ; Mon, 16 Nov 2020 12:01:31 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4E5BD436BF for ; Mon, 16 Nov 2020 12:01:31 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Mon, 16 Nov 2020 12:01:13 +0100 Message-Id: <20201116110118.7483-7-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116110118.7483-1-s.ivanov@proxmox.com> References: <20201116110118.7483-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.087 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pmgbackup.pm] Subject: [pmg-devel] [PATCH pmg-api v3 5/7] pbs-integration: add CLI calls to pmgbackup X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2020 11:02:02 -0000 This patch adds to new categories for commands to pmgbackup: * pmgbackup remote - for managing PBS instances' configuration, cluster-wide * pmgbackup pbsjob - for managing backups, restores, pruning Signed-off-by: Stoiko Ivanov --- src/PMG/CLI/pmgbackup.pm | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/PMG/CLI/pmgbackup.pm b/src/PMG/CLI/pmgbackup.pm index 69224e5..228f5ab 100644 --- a/src/PMG/CLI/pmgbackup.pm +++ b/src/PMG/CLI/pmgbackup.pm @@ -3,19 +3,55 @@ package PMG::CLI::pmgbackup; use strict; use warnings; use Data::Dumper; +use POSIX qw(strftime); use PVE::Tools; use PVE::SafeSyslog; use PVE::INotify; use PVE::CLIHandler; +use PVE::CLIFormatter; +use PVE::JSONSchema qw(get_standard_option); +use PVE::PTY; use PMG::RESTEnvironment; use PMG::API2::Backup; +use PMG::API2::PBS::Remote; +use PMG::API2::PBS::Job; use base qw(PVE::CLIHandler); my $nodename = PVE::INotify::nodename(); +sub param_mapping { + my ($name) = @_; + + my $password_map = PVE::CLIHandler::get_standard_mapping('pve-password', { + func => sub { + my ($value) = @_; + return $value if $value; + return PVE::PTY::get_confirmed_password(); + }, + }); + + my $enc_key_map = { + name => 'encryption-key', + desc => 'a file containing an encryption key, or the special value "autogen"', + func => sub { + my ($value) = @_; + return $value if $value eq 'autogen'; + return PVE::Tools::file_get_contents($value); + } + }; + + + my $mapping = { + 'create' => [ $password_map, $enc_key_map ], + 'update_config' => [ $password_map, $enc_key_map ], + }; + return $mapping->{$name}; +} + + sub setup_environment { PMG::RESTEnvironment->setup_default_cli_env(); } @@ -32,6 +68,24 @@ our $cmddef = { backup => [ 'PMG::API2::Backup', 'backup', undef, { node => $nodename } ], restore => [ 'PMG::API2::Backup', 'restore', undef, { node => $nodename } ], list => [ 'PMG::API2::Backup', 'list', undef, { node => $nodename }, $format_backup_list ], + remote => { + list => ['PMG::API2::PBS::Remote', 'list', undef, undef, sub { + my ($data, $schema, $options) = @_; + PVE::CLIFormatter::print_api_result($data, $schema, ['remote', 'server', 'datastore', 'username' ], $options); + }, $PVE::RESTHandler::standard_output_options ], + add => ['PMG::API2::PBS::Remote', 'create', ['remote'] ], + remove => ['PMG::API2::PBS::Remote', 'delete', ['remote'] ], + set => ['PMG::API2::PBS::Remote', 'update_config', ['remote'] ], + }, + pbsjob => { + list_backups => ['PMG::API2::PBS::Job', 'get_snapshots', ['remote'] , { node => $nodename }, sub { + my ($data, $schema, $options) = @_; + PVE::CLIFormatter::print_api_result($data, $schema, ['time', 'size'], $options); + }, $PVE::RESTHandler::standard_output_options ], + forget => ['PMG::API2::PBS::Job', 'forget_snapshot', ['remote', 'time'], { node => $nodename} ], + run => ['PMG::API2::PBS::Job', 'run_backup', ['remote'], { node => $nodename} ], + restore => ['PMG::API2::PBS::Job', 'restore', ['remote'], { node => $nodename} ], + }, }; 1; -- 2.20.1