From d737adc6be50c053d39dbf9160d2d0cdb7099f19 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 28 Jan 2021 11:29:59 +0100
Subject: [PATCH] tape: rename changer_drive_id to changer_drivenum

---
 src/api2/config/drive.rs     | 28 ++++++++++++++--------------
 src/api2/tape/drive.rs       |  2 +-
 src/api2/types/tape/drive.rs |  8 ++++----
 src/tape/changer/mod.rs      |  2 +-
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/api2/config/drive.rs b/src/api2/config/drive.rs
index 5e0a078e..78ebecb3 100644
--- a/src/api2/config/drive.rs
+++ b/src/api2/config/drive.rs
@@ -10,7 +10,7 @@ use crate::{
         PROXMOX_CONFIG_DIGEST_SCHEMA,
         DRIVE_NAME_SCHEMA,
         CHANGER_NAME_SCHEMA,
-        CHANGER_DRIVE_ID_SCHEMA,
+        CHANGER_DRIVENUM_SCHEMA,
         LINUX_DRIVE_PATH_SCHEMA,
         DriveListEntry,
         LinuxTapeDrive,
@@ -36,8 +36,8 @@ use crate::{
                 schema: CHANGER_NAME_SCHEMA,
                 optional: true,
             },
-            "changer-drive-id": {
-                schema: CHANGER_DRIVE_ID_SCHEMA,
+            "changer-drivenum": {
+                schema: CHANGER_DRIVENUM_SCHEMA,
                 optional: true,
             },
         },
@@ -129,8 +129,8 @@ pub fn list_drives(
 pub enum DeletableProperty {
     /// Delete the changer property.
     changer,
-    /// Delete the changer-drive-id property.
-    changer_drive_id,
+    /// Delete the changer-drivenum property.
+    changer_drivenum,
 }
 
 #[api(
@@ -148,8 +148,8 @@ pub enum DeletableProperty {
                 schema: CHANGER_NAME_SCHEMA,
                 optional: true,
             },
-            "changer-drive-id": {
-                schema: CHANGER_DRIVE_ID_SCHEMA,
+            "changer-drivenum": {
+                schema: CHANGER_DRIVENUM_SCHEMA,
                 optional: true,
             },
             delete: {
@@ -172,7 +172,7 @@ pub fn update_drive(
     name: String,
     path: Option<String>,
     changer: Option<String>,
-    changer_drive_id: Option<u64>,
+    changer_drivenum: Option<u64>,
     delete: Option<Vec<DeletableProperty>>,
     digest: Option<String>,
    _param: Value,
@@ -194,9 +194,9 @@ pub fn update_drive(
             match delete_prop {
                 DeletableProperty::changer => {
                     data.changer = None;
-                    data.changer_drive_id = None;
+                    data.changer_drivenum = None;
                 },
-                DeletableProperty::changer_drive_id => { data.changer_drive_id = None; },
+                DeletableProperty::changer_drivenum => { data.changer_drivenum = None; },
             }
         }
     }
@@ -212,14 +212,14 @@ pub fn update_drive(
         data.changer = Some(changer);
     }
 
-    if let Some(changer_drive_id) = changer_drive_id {
-        if changer_drive_id == 0 {
-            data.changer_drive_id = None;
+    if let Some(changer_drivenum) = changer_drivenum {
+        if changer_drivenum == 0 {
+            data.changer_drivenum = None;
         } else {
             if data.changer.is_none() {
                 bail!("Option 'changer-drive-id' requires option 'changer'.");
             }
-            data.changer_drive_id = Some(changer_drive_id);
+            data.changer_drivenum = Some(changer_drivenum);
         }
     }
 
diff --git a/src/api2/tape/drive.rs b/src/api2/tape/drive.rs
index a88ef827..c86c666e 100644
--- a/src/api2/tape/drive.rs
+++ b/src/api2/tape/drive.rs
@@ -1128,7 +1128,7 @@ pub fn list_drives(
             name: drive.name,
             path: drive.path.clone(),
             changer: drive.changer,
-            changer_drivenum: drive.changer_drive_id,
+            changer_drivenum: drive.changer_drivenum,
             vendor: None,
             model: None,
             serial: None,
diff --git a/src/api2/types/tape/drive.rs b/src/api2/types/tape/drive.rs
index 537cf55d..9d9b0591 100644
--- a/src/api2/types/tape/drive.rs
+++ b/src/api2/types/tape/drive.rs
@@ -24,7 +24,7 @@ pub const LINUX_DRIVE_PATH_SCHEMA: Schema = StringSchema::new(
     "The path to a LINUX non-rewinding SCSI tape device (i.e. '/dev/nst0')")
     .schema();
 
-pub const CHANGER_DRIVE_ID_SCHEMA: Schema = IntegerSchema::new(
+pub const CHANGER_DRIVENUM_SCHEMA: Schema = IntegerSchema::new(
     "Associated changer drive number (requires option changer)")
     .minimum(0)
     .maximum(8)
@@ -62,8 +62,8 @@ pub struct VirtualTapeDrive {
             schema: CHANGER_NAME_SCHEMA,
             optional: true,
         },
-        "changer-drive-id": {
-            schema: CHANGER_DRIVE_ID_SCHEMA,
+        "changer-drivenum": {
+            schema: CHANGER_DRIVENUM_SCHEMA,
             optional: true,
         },
     }
@@ -77,7 +77,7 @@ pub struct LinuxTapeDrive {
     #[serde(skip_serializing_if="Option::is_none")]
     pub changer: Option<String>,
     #[serde(skip_serializing_if="Option::is_none")]
-    pub changer_drive_id: Option<u64>,
+    pub changer_drivenum: Option<u64>,
 }
 
 #[api()]
diff --git a/src/tape/changer/mod.rs b/src/tape/changer/mod.rs
index cb168842..30e30b94 100644
--- a/src/tape/changer/mod.rs
+++ b/src/tape/changer/mod.rs
@@ -420,7 +420,7 @@ impl MtxMediaChanger {
 
         Ok(Self {
             drive_name: drive_config.name.clone(),
-            drive_number: drive_config.changer_drive_id.unwrap_or(0),
+            drive_number: drive_config.changer_drivenum.unwrap_or(0),
             config: changer_config,
         })
     }