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 7DBF86B901
for <pbs-devel@lists.proxmox.com>; 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 F23F32100D
for <pbs-devel@lists.proxmox.com>; 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 6134F20FD2
for <pbs-devel@lists.proxmox.com>; 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 2B5F346130
for <pbs-devel@lists.proxmox.com>; Wed, 27 Jan 2021 11:34:02 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Wed, 27 Jan 2021 11:33:49 +0100
Message-Id: <20210127103401.32535-4-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.257 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, mod.rs]
Subject: [pbs-devel] [PATCH proxmox-backup 03/15] api2/tape/drive:
reorganize drive api
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: Wed, 27 Jan 2021 10:34:04 -0000
similar to the changers, create a listing at /tape/drive and put
the specific api calls below that
move the scan api call up one level
remove the status info from the config listing
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/config/drive.rs | 28 ++--------------
src/api2/tape/drive.rs | 62 +++++++++++++++++++++++++++++++----
src/api2/tape/mod.rs | 5 +++
src/bin/proxmox_tape/drive.rs | 2 +-
4 files changed, 63 insertions(+), 34 deletions(-)
diff --git a/src/api2/config/drive.rs b/src/api2/config/drive.rs
index 32d74c19..5e0a078e 100644
--- a/src/api2/config/drive.rs
+++ b/src/api2/config/drive.rs
@@ -19,7 +19,6 @@ use crate::{
tape::{
linux_tape_device_list,
check_drive_path,
- lookup_drive,
},
};
@@ -112,37 +111,14 @@ pub fn get_config(
pub fn list_drives(
_param: Value,
mut rpcenv: &mut dyn RpcEnvironment,
-) -> Result<Vec<DriveListEntry>, Error> {
+) -> Result<Vec<LinuxTapeDrive>, Error> {
let (config, digest) = config::drive::config()?;
- let linux_drives = linux_tape_device_list();
-
let drive_list: Vec<LinuxTapeDrive> = config.convert_to_typed_array("linux")?;
- let mut list = Vec::new();
-
- for drive in drive_list {
- let mut entry = DriveListEntry {
- name: drive.name,
- path: drive.path.clone(),
- changer: drive.changer,
- changer_drivenum: drive.changer_drive_id,
- vendor: None,
- model: None,
- serial: None,
- };
- if let Some(info) = lookup_drive(&linux_drives, &drive.path) {
- entry.vendor = Some(info.vendor.clone());
- entry.model = Some(info.model.clone());
- entry.serial = Some(info.serial.clone());
- }
-
- list.push(entry);
- }
-
rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
- Ok(list)
+ Ok(drive_list)
}
#[api()]
diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs
index 97c28344..a88ef827 100644
--- a/src/api2/tape/drive.rs
+++ b/src/api2/tape/drive.rs
@@ -31,6 +31,7 @@ use crate::{
MEDIA_LABEL_SCHEMA,
MEDIA_POOL_NAME_SCHEMA,
Authid,
+ DriveListEntry,
LinuxTapeDrive,
TapeDeviceInfo,
MediaIdFlat,
@@ -48,6 +49,7 @@ use crate::{
MediaCatalog,
MediaId,
linux_tape_device_list,
+ lookup_drive,
file_formats::{
MediaLabel,
MediaSetLabel,
@@ -1096,6 +1098,53 @@ pub fn catalog_media(
Ok(upid_str.into())
}
+#[api(
+ input: {
+ properties: {},
+ },
+ returns: {
+ description: "The list of configured drives with model information.",
+ type: Array,
+ items: {
+ type: DriveListEntry,
+ },
+ },
+)]
+/// List drives
+pub fn list_drives(
+ _param: Value,
+) -> Result<Vec<DriveListEntry>, Error> {
+
+ let (config, _) = config::drive::config()?;
+
+ let linux_drives = linux_tape_device_list();
+
+ let drive_list: Vec<LinuxTapeDrive> = config.convert_to_typed_array("linux")?;
+
+ let mut list = Vec::new();
+
+ for drive in drive_list {
+ let mut entry = DriveListEntry {
+ name: drive.name,
+ path: drive.path.clone(),
+ changer: drive.changer,
+ changer_drivenum: drive.changer_drive_id,
+ vendor: None,
+ model: None,
+ serial: None,
+ };
+ if let Some(info) = lookup_drive(&linux_drives, &drive.path) {
+ entry.vendor = Some(info.vendor.clone());
+ entry.model = Some(info.model.clone());
+ entry.serial = Some(info.serial.clone());
+ }
+
+ list.push(entry);
+ }
+
+ Ok(list)
+}
+
#[sortable]
pub const SUBDIRS: SubdirMap = &sorted!([
(
@@ -1159,11 +1208,6 @@ pub const SUBDIRS: SubdirMap = &sorted!([
&Router::new()
.put(&API_METHOD_REWIND)
),
- (
- "scan",
- &Router::new()
- .get(&API_METHOD_SCAN_DRIVES)
- ),
(
"status",
&Router::new()
@@ -1176,6 +1220,10 @@ pub const SUBDIRS: SubdirMap = &sorted!([
),
]);
-pub const ROUTER: Router = Router::new()
+const ITEM_ROUTER: Router = Router::new()
.get(&list_subdirs_api_method!(SUBDIRS))
- .subdirs(SUBDIRS);
+ .subdirs(&SUBDIRS);
+
+pub const ROUTER: Router = Router::new()
+ .get(&API_METHOD_LIST_DRIVES)
+ .match_all("drive", &ITEM_ROUTER);
diff --git a/src/api2/tape/mod.rs b/src/api2/tape/mod.rs
index 05cdb693..466f3b8b 100644
--- a/src/api2/tape/mod.rs
+++ b/src/api2/tape/mod.rs
@@ -54,6 +54,11 @@ const SUBDIRS: SubdirMap = &[
&Router::new()
.get(&API_METHOD_SCAN_CHANGERS),
),
+ (
+ "scan-drives",
+ &Router::new()
+ .get(&drive::API_METHOD_SCAN_DRIVES),
+ ),
];
pub const ROUTER: Router = Router::new()
diff --git a/src/bin/proxmox_tape/drive.rs b/src/bin/proxmox_tape/drive.rs
index da61ddcf..e99ee860 100644
--- a/src/bin/proxmox_tape/drive.rs
+++ b/src/bin/proxmox_tape/drive.rs
@@ -79,7 +79,7 @@ fn list_drives(
) -> Result<(), Error> {
let output_format = get_output_format(¶m);
- let info = &api2::config::drive::API_METHOD_LIST_DRIVES;
+ let info = &api2::tape::drive::API_METHOD_LIST_DRIVES;
let mut data = match info.handler {
ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
_ => unreachable!(),
--
2.20.1