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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 581A56B87F for ; Wed, 27 Jan 2021 11:34:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DC85620FFB for ; Wed, 27 Jan 2021 11:34:03 +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 B916020FE0 for ; Wed, 27 Jan 2021 11:34:02 +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 6C03C46130 for ; Wed, 27 Jan 2021 11:34:02 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 27 Jan 2021 11:33:47 +0100 Message-Id: <20210127103401.32535-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210127103401.32535-1-d.csapak@proxmox.com> References: <20210127103401.32535-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.258 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 01/15] api2/types/tape/drive: add changer_drivenum 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: Wed, 27 Jan 2021 10:34:04 -0000 so that an api user can see which drive belongs to which drivenum of a changer for ones with multiple drives Signed-off-by: Dominik Csapak --- src/api2/config/changer.rs | 1 + src/api2/config/drive.rs | 1 + src/api2/tape/changer.rs | 1 + src/api2/types/tape/drive.rs | 4 ++++ 4 files changed, 7 insertions(+) diff --git a/src/api2/config/changer.rs b/src/api2/config/changer.rs index df8e042d..1b429659 100644 --- a/src/api2/config/changer.rs +++ b/src/api2/config/changer.rs @@ -134,6 +134,7 @@ pub fn list_changers( name: changer.name, path: changer.path.clone(), changer: None, + changer_drivenum: None, vendor: None, model: None, serial: None, diff --git a/src/api2/config/drive.rs b/src/api2/config/drive.rs index 7a05238b..32d74c19 100644 --- a/src/api2/config/drive.rs +++ b/src/api2/config/drive.rs @@ -127,6 +127,7 @@ pub fn list_drives( name: drive.name, path: drive.path.clone(), changer: drive.changer, + changer_drivenum: drive.changer_drive_id, vendor: None, model: None, serial: None, diff --git a/src/api2/tape/changer.rs b/src/api2/tape/changer.rs index 8239e041..87737d32 100644 --- a/src/api2/tape/changer.rs +++ b/src/api2/tape/changer.rs @@ -166,6 +166,7 @@ pub fn list_changers( name: changer.name, path: changer.path.clone(), changer: None, + changer_drivenum: None, vendor: None, model: None, serial: None, diff --git a/src/api2/types/tape/drive.rs b/src/api2/types/tape/drive.rs index 6e5e3b15..537cf55d 100644 --- a/src/api2/types/tape/drive.rs +++ b/src/api2/types/tape/drive.rs @@ -82,6 +82,7 @@ pub struct LinuxTapeDrive { #[api()] #[derive(Serialize,Deserialize)] +#[serde(rename_all = "kebab-case")] /// Drive list entry pub struct DriveListEntry { /// Drive name @@ -91,6 +92,9 @@ pub struct DriveListEntry { /// Associated changer device #[serde(skip_serializing_if="Option::is_none")] pub changer: Option, + /// Drive number in associated changer device + #[serde(skip_serializing_if="Option::is_none")] + pub changer_drivenum: Option, /// Vendor (autodetected) #[serde(skip_serializing_if="Option::is_none")] pub vendor: Option, -- 2.20.1