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 CCC6D694DB for ; Tue, 2 Mar 2021 12:19:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C9F612BACF for ; Tue, 2 Mar 2021 12:19:42 +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 80F992BAB1 for ; Tue, 2 Mar 2021 12:19:41 +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 3E45F4583D for ; Tue, 2 Mar 2021 12:19:41 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 2 Mar 2021 12:19:36 +0100 Message-Id: <20210302111940.17276-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.202 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] Subject: [pbs-devel] [PATCH proxmox-backup 1/5] api2/tape/drive: add state 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: Tue, 02 Mar 2021 11:19:42 -0000 Signed-off-by: Dominik Csapak --- src/api2/tape/drive.rs | 4 +++- src/api2/types/tape/drive.rs | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs index 6ef6a78b..f3cb1470 100644 --- a/src/api2/tape/drive.rs +++ b/src/api2/tape/drive.rs @@ -64,6 +64,7 @@ use crate::{ open_drive, lock_tape_device, set_tape_device_state, + get_tape_device_state, }, changer::update_changer_online_status, }, @@ -1223,7 +1224,8 @@ pub fn list_drives( } let info = lookup_device_identification(&linux_drives, &drive.path); - let entry = DriveListEntry { config: drive, info }; + let state = get_tape_device_state(&config, &drive.name)?; + let entry = DriveListEntry { config: drive, info, state }; list.push(entry); } diff --git a/src/api2/types/tape/drive.rs b/src/api2/types/tape/drive.rs index 067fdeba..2fd480ac 100644 --- a/src/api2/types/tape/drive.rs +++ b/src/api2/types/tape/drive.rs @@ -99,6 +99,9 @@ pub struct DriveListEntry { pub config: LinuxTapeDrive, #[serde(flatten)] pub info: OptionalDeviceIdentification, + /// the state of the drive if locked + #[serde(skip_serializing_if="Option::is_none")] + pub state: Option, } #[api()] -- 2.20.1