tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tape: API type cleanup, use serde flatten to derive types

Browse Source
This commit is contained in:
Dietmar Maurer
2021-01-30 09:36:54 +01:00
parent 9586ce2f46
commit b5b99a52cd
8 changed files with 97 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/api2/config/changer.rs
View File

@ -17,7 +17,6 @@ use crate::{
LINUX_DRIVE_PATH_SCHEMA,
SLOT_ARRAY_SCHEMA,
EXPORT_SLOT_LIST_SCHEMA,
DriveListEntry,
ScsiTapeChanger,
LinuxTapeDrive,
},
@ -121,7 +120,7 @@ pub fn get_config(
description: "The list of configured changers (with config digest).",
type: Array,
items: {
type: DriveListEntry,
type: ScsiTapeChanger,
},
},
)]
@ -129,27 +128,14 @@ pub fn get_config(
pub fn list_changers(
_param: Value,
mut rpcenv: &mut dyn RpcEnvironment,
) -> Result<Vec<DriveListEntry>, Error> {
) -> Result<Vec<ScsiTapeChanger>, Error> {
let (config, digest) = config::drive::config()?;
let changer_list: Vec<ScsiTapeChanger> = config.convert_to_typed_array("changer")?;
let mut list = Vec::new();
for changer in changer_list {
list.push(DriveListEntry {
name: changer.name,
path: changer.path.clone(),
changer: None,
changer_drivenum: None,
vendor: None,
model: None,
serial: None,
});
}
let list: Vec<ScsiTapeChanger> = config.convert_to_typed_array("changer")?;
rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
Ok(list)
}
#[api()]

4
src/api2/config/drive.rs
View File

@ -12,7 +12,6 @@ use crate::{
CHANGER_NAME_SCHEMA,
CHANGER_DRIVENUM_SCHEMA,
LINUX_DRIVE_PATH_SCHEMA,
DriveListEntry,
LinuxTapeDrive,
ScsiTapeChanger,
},
@ -110,7 +109,7 @@ pub fn get_config(
description: "The list of configured drives (with config digest).",
type: Array,
items: {
type: DriveListEntry,
type: LinuxTapeDrive,
},
},
)]
@ -125,6 +124,7 @@ pub fn list_drives(
let drive_list: Vec<LinuxTapeDrive> = config.convert_to_typed_array("linux")?;
rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
Ok(drive_list)
}