From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 3A552BC614 for ; Thu, 28 Mar 2024 14:51:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 30CA0CC11 for ; Thu, 28 Mar 2024 14:50:38 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 28 Mar 2024 14:50:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E018B429FA for ; Thu, 28 Mar 2024 14:50:34 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Thu, 28 Mar 2024 14:50:25 +0100 Message-Id: <20240328135028.504520-28-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240328135028.504520-1-a.lauterer@proxmox.com> References: <20240328135028.504520-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.062 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH v3 27/30] common: add deserializer for FsType X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2024 13:51:11 -0000 Signed-off-by: Aaron Lauterer --- proxmox-installer-common/Cargo.toml | 1 + proxmox-installer-common/src/options.rs | 10 ++++-- proxmox-installer-common/src/setup.rs | 43 +++++++++++++++++++++++-- 3 files changed, 48 insertions(+), 6 deletions(-) diff --git a/proxmox-installer-common/Cargo.toml b/proxmox-installer-common/Cargo.toml index bde5457..70f828a 100644 --- a/proxmox-installer-common/Cargo.toml +++ b/proxmox-installer-common/Cargo.toml @@ -8,5 +8,6 @@ exclude = [ "build", "debian" ] homepage = "https://www.proxmox.com" [dependencies] +regex = "1.7" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/proxmox-installer-common/src/options.rs b/proxmox-installer-common/src/options.rs index 1efac66..1e782f9 100644 --- a/proxmox-installer-common/src/options.rs +++ b/proxmox-installer-common/src/options.rs @@ -1,6 +1,6 @@ +use serde::Deserialize; use std::net::{IpAddr, Ipv4Addr}; use std::{cmp, fmt}; -use serde::Deserialize; use crate::setup::{ LocaleInfo, NetworkInfo, ProductConfig, ProxmoxProduct, RuntimeInfo, SetupInfo, @@ -32,8 +32,11 @@ pub enum ZfsRaidLevel { Raid0, Raid1, Raid10, + #[serde(rename = "raidz-1")] RaidZ, + #[serde(rename = "raidz-2")] RaidZ2, + #[serde(rename = "raidz-3")] RaidZ3, } @@ -51,7 +54,8 @@ impl fmt::Display for ZfsRaidLevel { } } -#[derive(Copy, Clone, Debug, Eq, PartialEq)] +#[derive(Copy, Clone, Debug, Deserialize, Eq, PartialEq)] +#[serde(rename_all = "lowercase")] pub enum FsType { Ext4, Xfs, @@ -226,7 +230,7 @@ pub enum AdvancedBootdiskOptions { Btrfs(BtrfsBootdiskOptions), } -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, Deserialize, PartialEq)] pub struct Disk { pub index: String, pub path: String, diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs index 8432a2c..743e7a9 100644 --- a/proxmox-installer-common/src/setup.rs +++ b/proxmox-installer-common/src/setup.rs @@ -8,6 +8,7 @@ use std::{ path::{Path, PathBuf}, process::{self, Command, Stdio}, }; +use regex::Regex; use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; @@ -145,7 +146,7 @@ pub fn installer_setup(in_test_mode: bool) -> Result<(SetupInfo, LocaleInfo, Run } } -#[derive(Serialize)] +#[derive(Debug, Deserialize, Serialize)] pub struct InstallZfsOption { pub ashift: usize, #[serde(serialize_with = "serialize_as_display")] @@ -392,11 +393,11 @@ pub fn spawn_low_level_installer(test_mode: bool) -> io::Result } /// See Proxmox::Install::Config -#[derive(Serialize)] +#[derive(Debug, Deserialize, Serialize)] pub struct InstallConfig { pub autoreboot: usize, - #[serde(serialize_with = "serialize_fstype")] + #[serde(serialize_with = "serialize_fstype", deserialize_with = "deserialize_fs_type")] pub filesys: FsType, pub hdsize: f64, #[serde(skip_serializing_if = "Option::is_none")] @@ -471,3 +472,39 @@ where serializer.collect_str(value) } + +pub fn deserialize_fs_type<'de, D>(deserializer: D) -> Result +where + D: Deserializer<'de>, +{ + let de_fs: String = Deserialize::deserialize(deserializer)?; + + let fs; + let mut raid: Option = None; + let re_raid = Regex::new(r"^(?P.*) \((?P.*)\)$").map_err(de::Error::custom)?; + match re_raid.captures(de_fs.as_str()) { + Some(caps) => { + fs = caps.name("fs").unwrap().as_str().to_lowercase(); + raid = Some(caps.name("raid").unwrap().as_str().to_lowercase()); + }, + None => fs = de_fs, + } + + match fs { + t if t == "zfs" => { + let raidlevel: ZfsRaidLevel = Deserialize::deserialize(serde_json::Value::String(raid.unwrap())) + .map_err(de::Error::custom)?; + Ok(FsType::Zfs(raidlevel)) + } + t if t == "btrfs" => { + let raidlevel: BtrfsRaidLevel = Deserialize::deserialize(serde_json::Value::String(raid.unwrap())) + .map_err(de::Error::custom)?; + Ok(FsType::Btrfs(raidlevel)) + } + t => { + let fstype: FsType = Deserialize::deserialize(serde_json::Value::String(t)) + .map_err(de::Error::custom)?; + Ok(fstype) + } + } +} -- 2.39.2