From dbda1513c5ac57e265474acec3e20d57f4bb179c Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 12 Aug 2021 09:04:16 +0200
Subject: [PATCH] tape: media_pool: derive and use Updater

---
 src/api2/config/media_pool.rs     | 44 +++++++------------------------
 src/api2/types/tape/media_pool.rs |  5 ++--
 2 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/src/api2/config/media_pool.rs b/src/api2/config/media_pool.rs
index dc0222a6..56b296af 100644
--- a/src/api2/config/media_pool.rs
+++ b/src/api2/config/media_pool.rs
@@ -14,12 +14,8 @@ use crate::{
     api2::types::{
         Authid,
         MEDIA_POOL_NAME_SCHEMA,
-        MEDIA_SET_NAMING_TEMPLATE_SCHEMA,
-        MEDIA_SET_ALLOCATION_POLICY_SCHEMA,
-        MEDIA_RETENTION_POLICY_SCHEMA,
-        TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA,
-        SINGLE_LINE_COMMENT_SCHEMA,
         MediaPoolConfig,
+        MediaPoolConfigUpdater,
     },
     config::{
         self,
@@ -151,25 +147,9 @@ pub enum DeletableProperty {
             name: {
                 schema: MEDIA_POOL_NAME_SCHEMA,
             },
-            allocation: {
-                schema: MEDIA_SET_ALLOCATION_POLICY_SCHEMA,
-                optional: true,
-            },
-            retention: {
-                schema: MEDIA_RETENTION_POLICY_SCHEMA,
-                optional: true,
-            },
-            template: {
-                schema: MEDIA_SET_NAMING_TEMPLATE_SCHEMA,
-                optional: true,
-            },
-            encrypt: {
-                schema: TAPE_ENCRYPTION_KEY_FINGERPRINT_SCHEMA,
-                optional: true,
-            },
-            comment: {
-                optional: true,
-                schema: SINGLE_LINE_COMMENT_SCHEMA,
+            update: {
+                type: MediaPoolConfigUpdater,
+                flatten: true,
             },
             delete: {
                 description: "List of properties to delete.",
@@ -188,11 +168,7 @@ pub enum DeletableProperty {
 /// Update media pool settings
 pub fn update_pool(
     name: String,
-    allocation: Option<String>,
-    retention: Option<String>,
-    template: Option<String>,
-    encrypt: Option<String>,
-    comment: Option<String>,
+    update: MediaPoolConfigUpdater,
     delete: Option<Vec<DeletableProperty>>,
 ) -> Result<(), Error> {
 
@@ -214,12 +190,12 @@ pub fn update_pool(
         }
     }
 
-    if allocation.is_some() { data.allocation = allocation; }
-    if retention.is_some() { data.retention = retention; }
-    if template.is_some() { data.template = template; }
-    if encrypt.is_some() { data.encrypt = encrypt; }
+    if update.allocation.is_some() { data.allocation = update.allocation; }
+    if update.retention.is_some() { data.retention = update.retention; }
+    if update.template.is_some() { data.template = update.template; }
+    if update.encrypt.is_some() { data.encrypt = update.encrypt; }
 
-    if let Some(comment) = comment {
+    if let Some(comment) = update.comment {
         let comment = comment.trim();
         if comment.is_empty() {
             data.comment = None;
diff --git a/src/api2/types/tape/media_pool.rs b/src/api2/types/tape/media_pool.rs
index 8e7e0389..5507cf09 100644
--- a/src/api2/types/tape/media_pool.rs
+++ b/src/api2/types/tape/media_pool.rs
@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 
 use proxmox::api::{
     api,
-    schema::{Schema, StringSchema, ApiStringFormat},
+    schema::{Schema, StringSchema, ApiStringFormat, Updater},
 };
 
 use crate::{
@@ -138,10 +138,11 @@ impl std::str::FromStr for RetentionPolicy {
         },
     },
 )]
-#[derive(Serialize,Deserialize)]
+#[derive(Serialize,Deserialize,Updater)]
 /// Media pool configuration
 pub struct MediaPoolConfig {
     /// The pool name
+    #[updater(skip)]
     pub name: String,
     /// Media Set allocation policy
     #[serde(skip_serializing_if="Option::is_none")]