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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 17D566B083
for <pbs-devel@lists.proxmox.com>; Mon, 25 Jan 2021 16:31:01 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 13280CED2
for <pbs-devel@lists.proxmox.com>; Mon, 25 Jan 2021 16:31:01 +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 91F1ECEBC
for <pbs-devel@lists.proxmox.com>; Mon, 25 Jan 2021 16:30:59 +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 5DB24460E9
for <pbs-devel@lists.proxmox.com>; Mon, 25 Jan 2021 16:30:59 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Mon, 25 Jan 2021 16:30:56 +0100
Message-Id: <20210125153057.30061-3-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210125153057.30061-1-d.csapak@proxmox.com>
References: <20210125153057.30061-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.261 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
Subject: [pbs-devel] [PATCH proxmox-backup 3/4] api2/types/tape/drive: add
changer_slot
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: Mon, 25 Jan 2021 15:31:01 -0000
so that an api user can see which drive belongs to which slot of a changer
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/config/changer.rs | 1 +
src/api2/config/drive.rs | 1 +
src/api2/types/tape/drive.rs | 4 ++++
3 files changed, 6 insertions(+)
diff --git a/src/api2/config/changer.rs b/src/api2/config/changer.rs
index c1e8c59e..3a838504 100644
--- a/src/api2/config/changer.rs
+++ b/src/api2/config/changer.rs
@@ -137,6 +137,7 @@ pub fn list_changers(
name: changer.name,
path: changer.path.clone(),
changer: None,
+ changer_slot: None,
vendor: None,
model: None,
serial: None,
diff --git a/src/api2/config/drive.rs b/src/api2/config/drive.rs
index 7a05238b..76092c49 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_slot: drive.changer_drive_id,
vendor: None,
model: None,
serial: None,
diff --git a/src/api2/types/tape/drive.rs b/src/api2/types/tape/drive.rs
index 6e5e3b15..cc2d5d63 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<String>,
+ /// Slot in associated changer device
+ #[serde(skip_serializing_if="Option::is_none")]
+ pub changer_slot: Option<u64>,
/// Vendor (autodetected)
#[serde(skip_serializing_if="Option::is_none")]
pub vendor: Option<String>,
--
2.20.1