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 v2 12/25] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization
Date: Thu, 21 Sep 2023 14:51:54 +0200	[thread overview]
Message-ID: <20230921125207.1301656-13-h.laimer@proxmox.com> (raw)
In-Reply-To: <20230921125207.1301656-1-h.laimer@proxmox.com>

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

diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index 5464ce69..f52136d0 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -341,10 +341,13 @@ 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(proxmox_schema::de::SchemaDeserializer::new(
+                str,
+                &MaintenanceMode::API_SCHEMA,
+            ))
+            .ok()
+        })
     }
 
     pub fn set_maintenance_mode(&mut self, mode: Option<MaintenanceMode>) {
-- 
2.39.2





  parent reply	other threads:[~2023-09-21 12:52 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-21 12:51 [pbs-devel] [PATCH proxmox-backup v2 00/25] add removable datastores Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 01/25] tools: add disks utility functions Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 02/25] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 03/25] maintenance: add 'Unpplugged' maintenance type Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 04/25] disks: add UUID to partition info Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 05/25] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 06/25] add helper for checking if a removable datastore is available Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 07/25] api2: removable datastore creation Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 08/25] ui: add partition selector form Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 09/25] api2: disks list: add only-unused flag Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 10/25] ui: add removable datastore creation support Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 11/25] ui: add (un)mount button to summary Hannes Laimer
2023-09-21 12:51 ` Hannes Laimer [this message]
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 13/25] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 14/25] ui: display removable datastores in list Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 15/25] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 16/25] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2023-09-21 12:51 ` [pbs-devel] [PATCH proxmox-backup v2 17/25] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 18/25] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 19/25] ui: maintenance: disable edit if unplugged Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 20/25] pb-manager: add (un)mount command Hannes Laimer
2023-12-11 13:00   ` Gabriel Goller
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 21/25] add auto-mounting for removable datastores Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 22/25] api: mark removable datastores as unplugged after restart Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 23/25] datastore: handle deletion of removable datastore properly Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 24/25] docs: mention maintenance mode reset when removable datastore is unplugged Hannes Laimer
2023-09-21 12:52 ` [pbs-devel] [PATCH proxmox-backup v2 25/25] bump proxmox-schema dependency to 2.0.1 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=20230921125207.1301656-13-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