From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id B84EE6BE84
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:57 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8289C2D22E
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:57 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 585F52D277
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:56 +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 237F646148
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:56 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 28 Jan 2021 12:59:41 +0100
Message-Id: <20210128115955.23136-2-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210128115955.23136-1-d.csapak@proxmox.com>
References: <20210128115955.23136-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.250 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. [drive.rs, changer.rs]
Subject: [pbs-devel] [PATCH proxmox-backup v2 01/15] api2/tape/changer: add
changer filter to list_drives api call
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2021 11:59:57 -0000
so that an api user can get the drives belonging to a changer
without having to parse the config listing themselves
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/tape/changer.rs | 4 ++--
src/api2/tape/drive.rs | 13 ++++++++++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/api2/tape/changer.rs b/src/api2/tape/changer.rs
index 87737d32..84030f8e 100644
--- a/src/api2/tape/changer.rs
+++ b/src/api2/tape/changer.rs
@@ -11,9 +11,9 @@ use crate::{
api2::types::{
CHANGER_NAME_SCHEMA,
DriveListEntry,
- ScsiTapeChanger,
- MtxStatusEntry,
MtxEntryKind,
+ MtxStatusEntry,
+ ScsiTapeChanger,
},
tape::{
TAPE_STATUS_DIR,
diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs
index c86c666e..df7752df 100644
--- a/src/api2/tape/drive.rs
+++ b/src/api2/tape/drive.rs
@@ -27,6 +27,7 @@ use crate::{
api2::{
types::{
UPID_SCHEMA,
+ CHANGER_NAME_SCHEMA,
DRIVE_NAME_SCHEMA,
MEDIA_LABEL_SCHEMA,
MEDIA_POOL_NAME_SCHEMA,
@@ -1100,7 +1101,12 @@ pub fn catalog_media(
#[api(
input: {
- properties: {},
+ properties: {
+ changer: {
+ schema: CHANGER_NAME_SCHEMA,
+ optional: true,
+ },
+ },
},
returns: {
description: "The list of configured drives with model information.",
@@ -1112,6 +1118,7 @@ pub fn catalog_media(
)]
/// List drives
pub fn list_drives(
+ changer: Option<String>,
_param: Value,
) -> Result<Vec<DriveListEntry>, Error> {
@@ -1124,6 +1131,10 @@ pub fn list_drives(
let mut list = Vec::new();
for drive in drive_list {
+ if changer.is_some() && drive.changer != changer {
+ continue;
+ }
+
let mut entry = DriveListEntry {
name: drive.name,
path: drive.path.clone(),
--
2.20.1