From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v5 09/22] pbs-api-types: use SchemaDeserializer for maintenance mode
Date: Wed, 17 Apr 2024 14:23:49 +0200 [thread overview]
Message-ID: <20240417122402.51956-10-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240417122402.51956-1-h.laimer@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 898149ea..8fefee64 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::{
@@ -348,10 +348,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()
+ })
}
}
--
2.39.2
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-04-17 12:24 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-17 12:23 [pbs-devel] [PATCH proxmox-backup v5 00/22] add removable datastores Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 01/22] tools: add disks utility functions Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 02/22] datastore: add cache entry flag for droping it after last task Hannes Laimer
2024-04-18 5:12 ` Thomas Lamprecht
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 03/22] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 04/22] disks: add UUID to partition info Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 05/22] add helper for checking if a removable datastore is available Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 06/22] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 07/22] api2: removable datastore creation Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 08/22] api2: disks list: add only-unused flag Hannes Laimer
2024-04-17 12:23 ` Hannes Laimer [this message]
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 10/22] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 11/22] bin: manager: add (un)mount command Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 12/22] add auto-mounting for removable datastores Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 13/22] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 14/22] docs: add removable datastores section Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 15/22] ui: add partition selector form Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 16/22] ui: add removable datastore creation support Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 17/22] ui: add (un)mount button to summary Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 18/22] ui: display removable datastores in list Hannes Laimer
2024-04-17 12:23 ` [pbs-devel] [PATCH proxmox-backup v5 19/22] ui: utils: render unplugged datastores correctly Hannes Laimer
2024-04-17 12:24 ` [pbs-devel] [PATCH proxmox-backup v5 20/22] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-17 12:24 ` [pbs-devel] [PATCH proxmox-backup v5 21/22] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2024-04-17 12:24 ` [pbs-devel] [PATCH proxmox-backup v5 22/22] ui: maintenance: fix disable msg field if no type is selected 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=20240417122402.51956-10-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