public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v6 02/23] pbs-api-types: use SchemaDeserializer for maintenance mode
Date: Thu, 18 Apr 2024 16:29:10 +0200	[thread overview]
Message-ID: <20240418142931.122618-3-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240418142931.122618-1-h.laimer@proxmox.com>

From: Dietmar Maurer <dietmar@proxmox.com>

Signed-off-by: Dietmar Maurer <dietmar@proxmox.com>
Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 pbs-api-types/src/datastore.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index df836566..72b5a15c 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -6,8 +6,8 @@ use const_format::concatcp;
 use serde::{Deserialize, Serialize};
 
 use proxmox_schema::{
-    api, const_regex, ApiStringFormat, ApiType, ArraySchema, EnumEntry, IntegerSchema, ReturnType,
-    Schema, StringSchema, Updater, UpdaterType,
+    api, const_regex, de::SchemaDeserializer, ApiStringFormat, ApiType, ArraySchema, EnumEntry,
+    IntegerSchema, ReturnType, Schema, StringSchema, Updater, UpdaterType,
 };
 
 use crate::{
@@ -336,10 +336,10 @@ impl DataStoreConfig {
     }
 
     pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
-        self.maintenance_mode
-            .as_ref()
-            .and_then(|str| MaintenanceMode::API_SCHEMA.parse_property_string(str).ok())
-            .and_then(|value| MaintenanceMode::deserialize(value).ok())
+        self.maintenance_mode.as_ref().and_then(|str| {
+            MaintenanceMode::deserialize(SchemaDeserializer::new(str, &MaintenanceMode::API_SCHEMA))
+                .ok()
+        })
     }
 
     pub fn set_maintenance_mode(&mut self, new_mode: Option<MaintenanceMode>) -> Result<(), Error> {
-- 
2.39.2



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel


  parent reply	other threads:[~2024-04-18 14:29 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18 14:29 [pbs-devel] [PATCH proxmox-backup v6 00/23] add removable datastores Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 01/23] pbs-api-types: new MaintenanceType::Unmount, implement and use set_maintenance_mode Hannes Laimer
2024-04-18 14:29 ` Hannes Laimer [this message]
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 03/23] datastore: rename and simplify update-datastore-cache socket command Hannes Laimer
2024-04-19  6:53   ` Dietmar Maurer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 04/23] tools: add disks utility functions Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 05/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 06/23] disks: add UUID to partition info Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 07/23] add helper for checking if a removable datastore is available Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 08/23] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-19  7:27   ` Dietmar Maurer
2024-04-19  7:34     ` Dietmar Maurer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 09/23] api2: removable datastore creation Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 10/23] api2: disks list: add only-unused flag Hannes Laimer
2024-04-18 14:50   ` Christian Ebner
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 11/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 12/23] bin: manager: add (un)mount command Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 13/23] add auto-mounting for removable datastores Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 14/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 15/23] docs: add removable datastores section Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 16/23] ui: add partition selector form Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 17/23] ui: add removable datastore creation support Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 18/23] ui: add (un)mount button to summary Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 19/23] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 20/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 21/23] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 22/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-18 14:29 ` [pbs-devel] [PATCH proxmox-backup v6 23/23] ui: render 'unmount' maintenance mode correctly Hannes Laimer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240418142931.122618-3-h.laimer@proxmox.com \
    --to=h.laimer@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal