more api type cleanups: avoid re-exports

src/tape/changer/mod.rs

@@ -23,11 +23,7 @@ use proxmox::{
     },
 };
 
-use crate::api2::types::{
-    SLOT_ARRAY_SCHEMA,
-    ScsiTapeChanger,
-    LtoTapeDrive,
-};
+use pbs_api_types::{SLOT_ARRAY_SCHEMA, ScsiTapeChanger, LtoTapeDrive};
 
 /// Changer element status.
 ///

src/tape/changer/mtx/mtx_wrapper.rs

@@ -1,9 +1,9 @@
 use anyhow::Error;
 
 use pbs_tools::run_command;
+use pbs_api_types::ScsiTapeChanger;
 
 use crate::{
-    api2::types::ScsiTapeChanger,
     tape::changer::{
         MtxStatus,
         mtx::parse_mtx_status,

src/tape/changer/online_status_map.rs

@@ -6,11 +6,9 @@ use anyhow::{bail, Error};
 use proxmox::tools::Uuid;
 use proxmox::api::section_config::SectionConfigData;
 
+use pbs_api_types::{VirtualTapeDrive, ScsiTapeChanger};
+
 use crate::{
-    api2::types::{
-        VirtualTapeDrive,
-        ScsiTapeChanger,
-    },
     tape::{
         Inventory,
         changer::{

src/tape/changer/sg_pt_changer.rs

@@ -11,6 +11,8 @@ use endian_trait::Endian;
 
 use proxmox::tools::io::ReadExt;
 
+use pbs_api_types::ScsiTapeChanger;
+
 use crate::{
     tape::{
         changer::{
@@ -28,7 +30,6 @@ use crate::{
         scsi_ascii_to_string,
         scsi_inquiry,
     },
-    api2::types::ScsiTapeChanger,
 };
 
 const SCSI_CHANGER_DEFAULT_TIMEOUT: usize = 60*5; // 5 minutes

src/tape/drive/lto/sg_tape.rs

@@ -29,11 +29,9 @@ use proxmox::{
     tools::io::{ReadExt, WriteExt},
 };
 
+use pbs_api_types::{MamAttribute, Lp17VolumeStatistics};
+
 use crate::{
-    api2::types::{
-        MamAttribute,
-        Lp17VolumeStatistics,
-    },
     tape::{
         BlockRead,
         BlockReadError,

src/tape/drive/lto/sg_tape/mam.rs

@@ -7,12 +7,11 @@ use endian_trait::Endian;
 
 use proxmox::tools::io::ReadExt;
 
+use pbs_api_types::MamAttribute;
+
 use crate::{
-    api2::types::MamAttribute,
     tools::sgutils2::SgRaw,
-    tape::{
-        drive::lto::TapeAlertFlags,
-    },
+    tape::drive::lto::TapeAlertFlags,
 };
 
 // Read Medium auxiliary memory attributes (MAM)

src/tape/drive/lto/sg_tape/volume_statistics.rs

@@ -6,10 +6,9 @@ use endian_trait::Endian;
 
 use proxmox::tools::io::ReadExt;
 
-use crate::{
-    api2::types::Lp17VolumeStatistics,
-    tools::sgutils2::SgRaw,
-};
+use pbs_api_types::Lp17VolumeStatistics;
+
+use crate::tools::sgutils2::SgRaw;
 
 /// SCSI command to query volume statistics
 ///

src/tape/inventory.rs

@@ -41,6 +41,7 @@ use proxmox::tools::{
 
 use pbs_systemd::time::compute_next_event;
 use pbs_config::BackupLockGuard;
+use pbs_api_types::{MediaSetPolicy, RetentionPolicy, MediaStatus, MediaLocation};
 
 #[cfg(not(test))]
 use pbs_config::open_backup_lockfile;
@@ -56,12 +57,6 @@ fn open_backup_lockfile<P: AsRef<std::path::Path>>(
 
 
 use crate::{
-    api2::types::{
-        MediaSetPolicy,
-        RetentionPolicy,
-        MediaStatus,
-        MediaLocation,
-    },
     tape::{
         TAPE_STATUS_DIR,
         MediaSet,

src/tape/linux_list_drives.rs

@@ -4,14 +4,7 @@ use std::collections::HashMap;
 use anyhow::{bail, Error};
 
 use pbs_tools::fs::scan_subdir;
-
-use crate::{
-    api2::types::{
-        DeviceKind,
-        OptionalDeviceIdentification,
-        TapeDeviceInfo,
-    },
-};
+use pbs_api_types::{DeviceKind, OptionalDeviceIdentification, TapeDeviceInfo};
 
 lazy_static::lazy_static!{
     static ref SCSI_GENERIC_NAME_REGEX: regex::Regex =

src/tape/media_pool.rs

@@ -14,31 +14,25 @@ use serde::{Deserialize, Serialize};
 
 use proxmox::tools::Uuid;
 
-use pbs_api_types::Fingerprint;
+use pbs_api_types::{
+    Fingerprint, MediaStatus, MediaLocation, MediaSetPolicy, RetentionPolicy,
+    MediaPoolConfig,
+};
 use pbs_systemd::time::compute_next_event;
 use pbs_config::BackupLockGuard;
 
-use crate::{
-    api2::types::{
-        MediaStatus,
-        MediaLocation,
-        MediaSetPolicy,
-        RetentionPolicy,
-        MediaPoolConfig,
+use crate::tape::{
+    MediaId,
+    MediaSet,
+    Inventory,
+    MediaCatalog,
+    lock_media_set,
+    lock_media_pool,
+    lock_unassigned_media_pool,
+    file_formats::{
+        MediaLabel,
+        MediaSetLabel,
     },
-    tape::{
-        MediaId,
-        MediaSet,
-        Inventory,
-        MediaCatalog,
-        lock_media_set,
-        lock_media_pool,
-        lock_unassigned_media_pool,
-        file_formats::{
-            MediaLabel,
-            MediaSetLabel,
-        },
-    }
 };
 
 /// Media Pool