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 61EDD6C313 for ; Fri, 29 Jan 2021 14:58:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4E7A3F6B4 for ; Fri, 29 Jan 2021 14:57:54 +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 28E43F691 for ; Fri, 29 Jan 2021 14:57:53 +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 E596443B37 for ; Fri, 29 Jan 2021 14:57:52 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 29 Jan 2021 14:57:48 +0100 Message-Id: <20210129135752.16123-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.243 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. [changer.rs, drive.rs] Subject: [pbs-devel] [PATCH proxmox-backup 1/5] api2/tape: add export_slots to DriveListEntry X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jan 2021 13:58:24 -0000 so that we can show it in the changer config grid Signed-off-by: Dominik Csapak --- src/api2/config/changer.rs | 1 + src/api2/tape/changer.rs | 1 + src/api2/tape/drive.rs | 1 + src/api2/types/tape/drive.rs | 3 +++ 4 files changed, 6 insertions(+) diff --git a/src/api2/config/changer.rs b/src/api2/config/changer.rs index 8404d20b..832939e9 100644 --- a/src/api2/config/changer.rs +++ b/src/api2/config/changer.rs @@ -146,6 +146,7 @@ pub fn list_changers( vendor: None, model: None, serial: None, + export_slots: changer.export_slots, }); } diff --git a/src/api2/tape/changer.rs b/src/api2/tape/changer.rs index 84030f8e..64d36ae8 100644 --- a/src/api2/tape/changer.rs +++ b/src/api2/tape/changer.rs @@ -167,6 +167,7 @@ pub fn list_changers( path: changer.path.clone(), changer: None, changer_drivenum: None, + export_slots: changer.export_slots, vendor: None, model: None, serial: None, diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 23991367..a49342fa 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -1162,6 +1162,7 @@ pub fn list_drives( vendor: None, model: None, serial: None, + export_slots: None, }; if let Some(info) = lookup_drive(&linux_drives, &drive.path) { entry.vendor = Some(info.vendor.clone()); diff --git a/src/api2/types/tape/drive.rs b/src/api2/types/tape/drive.rs index 9d9b0591..a17e5cbb 100644 --- a/src/api2/types/tape/drive.rs +++ b/src/api2/types/tape/drive.rs @@ -104,6 +104,9 @@ pub struct DriveListEntry { /// Serial number (autodetected) #[serde(skip_serializing_if="Option::is_none")] pub serial: Option, + /// Self defined Import/Export Slots for devices without explicit ones + #[serde(skip_serializing_if="Option::is_none")] + pub export_slots: Option, } #[api()] -- 2.20.1