tape/changer: add vendor/model to DriveStatus

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/src/tape/changer/mod.rs b/src/tape/changer/mod.rs
index 30e30b942c25a9aa1fb8e9930600b265f67a330d..0d3785873f1da60a68c8f634754357f241260a19 100644 (file)
--- a/src/tape/changer/mod.rs
+++ b/src/tape/changer/mod.rs
@@ -38,6 +38,10 @@ pub struct DriveStatus {
     pub status: ElementStatus,
     /// Drive Identifier (Serial number)
     pub drive_serial_number: Option<String>,
+    /// Drive Vendor
+    pub vendor: Option<String>,
+    /// Drive Model
+    pub model: Option<String>,
     /// Element Address
     pub element_address: u16,
 }

diff --git a/src/tape/changer/mtx/parse_mtx_status.rs b/src/tape/changer/mtx/parse_mtx_status.rs
index c042c31856c43ab574274047bacc0cd1b90e5fd9..b2f5c5d7478e3b06f656ab99ec171d3d9a697728 100644 (file)
--- a/src/tape/changer/mtx/parse_mtx_status.rs
+++ b/src/tape/changer/mtx/parse_mtx_status.rs
@@ -46,6 +46,8 @@ fn parse_drive_status(i: &str, id: u64) -> IResult<&str, DriveStatus> {
             loaded_slot,
             status: ElementStatus::Empty,
             drive_serial_number: None,
+            vendor: None,
+            model: None,
             element_address: id as u16,
         };
         return Ok((empty, status));
@@ -71,6 +73,8 @@ fn parse_drive_status(i: &str, id: u64) -> IResult<&str, DriveStatus> {
             loaded_slot,
             status: ElementStatus::VolumeTag(tag.to_string()),
             drive_serial_number: None,
+            vendor: None,
+            model: None,
             element_address: id as u16,
         };
         return Ok((i, status));
@@ -82,6 +86,8 @@ fn parse_drive_status(i: &str, id: u64) -> IResult<&str, DriveStatus> {
         loaded_slot,
         status: ElementStatus::Full,
         drive_serial_number: None,
+        vendor: None,
+        model: None,
         element_address: id as u16,
     };
     Ok((i, status))

diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs
index 8596145769e6db3b6ec8fb1d77bdcb5df861a4e9..b6c64381349a8a8330ec3ef30883bf94a7ebd5fc 100644 (file)
--- a/src/tape/changer/sg_pt_changer.rs
+++ b/src/tape/changer/sg_pt_changer.rs
@@ -641,23 +641,25 @@ fn decode_element_status_page(
 
                         let dvcid: DvcidHead = unsafe { reader.read_be_value()? };
 
-                        let drive_serial_number = match (dvcid.code_set, dvcid.identifier_type) {
+                        let (drive_serial_number, vendor, model) = match (dvcid.code_set, dvcid.identifier_type) {
                             (2, 0) => { // Serial number only (Quantum Superloader3 uses this)
                                 let serial = reader.read_exact_allocated(dvcid.identifier_len as usize)?;
                                 let serial = scsi_ascii_to_string(&serial);
-                                Some(serial)
+                                (Some(serial), None, None)
                             }
                             (2, 1) => {
                                 if dvcid.identifier_len != 34 {
                                     bail!("got wrong DVCID length");
                                 }
-                                let _vendor = reader.read_exact_allocated(8)?;
-                                let _product = reader.read_exact_allocated(16)?;
+                                let vendor = reader.read_exact_allocated(8)?;
+                                let vendor = scsi_ascii_to_string(&vendor);
+                                let model = reader.read_exact_allocated(16)?;
+                                let model = scsi_ascii_to_string(&model);
                                 let serial = reader.read_exact_allocated(10)?;
                                 let serial = scsi_ascii_to_string(&serial);
-                                Some(serial)
+                                (Some(serial), Some(vendor), Some(model))
                             }
-                            _ => None,
+                            _ => (None, None, None),
                         };
 
                         result.last_element_address = Some(desc.element_address);
@@ -666,6 +668,8 @@ fn decode_element_status_page(
                             loaded_slot,
                             status: create_element_status(full, volume_tag),
                             drive_serial_number,
+                            vendor,
+                            model,
                             element_address: desc.element_address,
                         };
                         result.drives.push(drive);

diff --git a/src/tape/drive/virtual_tape.rs b/src/tape/drive/virtual_tape.rs
index 7dea49dea43f1e3041fffe1f13532c4d492b88f0..7fbc116707eca7acac43d3a85d9fd408bb62ad29 100644 (file)
--- a/src/tape/drive/virtual_tape.rs
+++ b/src/tape/drive/virtual_tape.rs
@@ -399,6 +399,8 @@ impl MediaChange for VirtualTapeHandle {
                 loaded_slot: None,
                 status: ElementStatus::VolumeTag(current_tape.name.clone()),
                 drive_serial_number: None,
+                vendor: None,
+                model: None,
                 element_address: 0,
            });
         }