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 A294191CDE for ; Thu, 4 Apr 2024 16:49:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 022404527 for ; Thu, 4 Apr 2024 16:49:14 +0200 (CEST) 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, 4 Apr 2024 16:49:09 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1599445168 for ; Thu, 4 Apr 2024 16:49:09 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Thu, 4 Apr 2024 16:48:41 +0200 Message-Id: <20240404144902.273800-10-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240404144902.273800-1-a.lauterer@proxmox.com> References: <20240404144902.273800-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.057 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 installer v4 09/30] auto-installer: add answer file definition 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, 04 Apr 2024 14:49:45 -0000 Signed-off-by: Aaron Lauterer --- proxmox-auto-installer/Cargo.toml | 1 + proxmox-auto-installer/src/answer.rs | 248 +++++++++++++++++++++++++++ proxmox-auto-installer/src/lib.rs | 1 + 3 files changed, 250 insertions(+) create mode 100644 proxmox-auto-installer/src/answer.rs diff --git a/proxmox-auto-installer/Cargo.toml b/proxmox-auto-installer/Cargo.toml index 67218dd..80de4fa 100644 --- a/proxmox-auto-installer/Cargo.toml +++ b/proxmox-auto-installer/Cargo.toml @@ -12,3 +12,4 @@ proxmox-installer-common = { path = "../proxmox-installer-common" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" toml = "0.7" +enum-iterator = "0.6.0" diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs new file mode 100644 index 0000000..0add95e --- /dev/null +++ b/proxmox-auto-installer/src/answer.rs @@ -0,0 +1,248 @@ +use proxmox_installer_common::{ + options::{BtrfsRaidLevel, FsType, ZfsChecksumOption, ZfsCompressOption, ZfsRaidLevel}, + utils::{CidrAddress, Fqdn}, +}; +use serde::{Deserialize, Serialize}; +use std::{collections::BTreeMap, net::IpAddr}; + +/// BTreeMap is used to store filters as the order of the filters will be stable, compared to +/// storing them in a HashMap + +#[derive(Clone, Deserialize, Debug)] +#[serde(rename_all = "kebab-case")] +pub struct Answer { + pub global: Global, + pub network: Network, + #[serde(rename = "disk-setup")] + pub disks: Disks, +} + +#[derive(Clone, Deserialize, Debug)] +pub struct Global { + pub country: String, + pub fqdn: Fqdn, + pub keyboard: String, + pub mailto: String, + pub timezone: String, + pub password: String, + pub pre_commands: Option>, + pub post_commands: Option>, + #[serde(default)] + pub reboot_on_error: bool, +} + +#[derive(Clone, Deserialize, Debug)] +struct NetworkInAnswer { + #[serde(default)] + pub use_dhcp: bool, + pub cidr: Option, + pub dns: Option, + pub gateway: Option, + pub filter: Option>, +} + +#[derive(Clone, Deserialize, Debug)] +#[serde(try_from = "NetworkInAnswer")] +pub struct Network { + pub network_settings: NetworkSettings, +} + +impl TryFrom for Network { + type Error = &'static str; + + fn try_from(source: NetworkInAnswer) -> Result { + if !source.use_dhcp { + if source.cidr.is_none() { + return Err("Field 'cidr' must be set."); + } + if source.dns.is_none() { + return Err("Field 'dns' must be set."); + } + if source.gateway.is_none() { + return Err("Field 'gateway' must be set."); + } + if source.filter.is_none() { + return Err("Field 'filter' must be set."); + } + + Ok(Network { + network_settings: NetworkSettings::Manual(NetworkManual { + cidr: source.cidr.unwrap(), + dns: source.dns.unwrap(), + gateway: source.gateway.unwrap(), + filter: source.filter.unwrap(), + }), + }) + } else { + Ok(Network { + network_settings: NetworkSettings::Dhcp(true), + }) + } + } +} + +#[derive(Clone, Debug)] +pub enum NetworkSettings { + Dhcp(bool), + Manual(NetworkManual), +} + +#[derive(Clone, Debug)] +pub struct NetworkManual { + pub cidr: CidrAddress, + pub dns: IpAddr, + pub gateway: IpAddr, + pub filter: BTreeMap, +} + +#[derive(Clone, Debug, Deserialize)] +pub struct DiskSetup { + pub filesystem: Filesystem, + #[serde(default)] + pub disk_list: Vec, + pub filter: Option>, + pub filter_match: Option, + pub zfs: Option, + pub lvm: Option, + pub btrfs: Option, +} + +#[derive(Clone, Debug, Deserialize)] +#[serde(try_from = "DiskSetup")] +pub struct Disks { + pub fs_type: FsType, + pub disk_selection: DiskSelection, + pub filter_match: Option, + pub fs_options: FsOptions, +} + +impl TryFrom for Disks { + type Error = &'static str; + + fn try_from(source: DiskSetup) -> Result { + if source.disk_list.is_empty() && source.filter.is_none() { + return Err("Need either 'disk_list' or 'filter' set"); + } + if !source.disk_list.is_empty() && source.filter.is_some() { + return Err("Cannot use both, 'disk_list' and 'filter'"); + } + + let disk_selection = if !source.disk_list.is_empty() { + DiskSelection::Selection(source.disk_list.clone()) + } else { + DiskSelection::Filter(source.filter.clone().unwrap()) + }; + + let lvm_checks = |source: &DiskSetup| -> Result<(), Self::Error> { + if source.zfs.is_some() || source.btrfs.is_some() { + return Err("make sure only 'lvm' options are set"); + } + if source.disk_list.len() > 1 { + return Err("make sure to define only one disk for ext4 and xfs"); + } + Ok(()) + }; + // TODO: improve checks for foreign FS options. E.g. less verbose and handling new FS types + // automatically + let (fs, fs_options) = match source.filesystem { + Filesystem::Xfs => { + lvm_checks(&source)?; + ( + FsType::Xfs, + FsOptions::LVM(source.lvm.unwrap_or(LvmOptions::default())), + ) + } + Filesystem::Ext4 => { + lvm_checks(&source)?; + ( + FsType::Ext4, + FsOptions::LVM(source.lvm.unwrap_or(LvmOptions::default())), + ) + } + Filesystem::Zfs => { + if source.lvm.is_some() || source.btrfs.is_some() { + return Err("make sure only 'zfs' options are set"); + } + match source.zfs { + None | Some(ZfsOptions { raid: None, .. }) => { + return Err("ZFS raid level 'zfs.raid' must be set") + } + Some(opts) => (FsType::Zfs(opts.raid.unwrap()), FsOptions::ZFS(opts)), + } + } + Filesystem::Btrfs => { + if source.zfs.is_some() || source.lvm.is_some() { + return Err("make sure only 'btrfs' options are set"); + } + match source.btrfs { + None | Some(BtrfsOptions { raid: None, .. }) => { + return Err("BTRFS raid level 'btrfs.raid' must be set") + } + Some(opts) => (FsType::Btrfs(opts.raid.unwrap()), FsOptions::BTRFS(opts)), + } + } + }; + + let res = Disks { + fs_type: fs, + disk_selection, + filter_match: source.filter_match, + fs_options, + }; + Ok(res) + } +} + +#[derive(Clone, Debug)] +pub enum FsOptions { + LVM(LvmOptions), + ZFS(ZfsOptions), + BTRFS(BtrfsOptions), +} + +#[derive(Clone, Debug)] +pub enum DiskSelection { + Selection(Vec), + Filter(BTreeMap), +} +#[derive(Clone, Deserialize, Debug, PartialEq)] +#[serde(rename_all = "lowercase")] +pub enum FilterMatch { + Any, + All, +} + +#[derive(Clone, Deserialize, Serialize, Debug, PartialEq)] +#[serde(rename_all = "lowercase")] +pub enum Filesystem { + Ext4, + Xfs, + Zfs, + Btrfs, +} + +#[derive(Clone, Copy, Default, Deserialize, Debug)] +pub struct ZfsOptions { + pub raid: Option, + pub ashift: Option, + pub arc_max: Option, + pub checksum: Option, + pub compress: Option, + pub copies: Option, + pub hdsize: Option, +} + +#[derive(Clone, Copy, Default, Deserialize, Serialize, Debug)] +pub struct LvmOptions { + pub hdsize: Option, + pub swapsize: Option, + pub maxroot: Option, + pub maxvz: Option, + pub minfree: Option, +} + +#[derive(Clone, Copy, Default, Deserialize, Debug)] +pub struct BtrfsOptions { + pub hdsize: Option, + pub raid: Option, +} diff --git a/proxmox-auto-installer/src/lib.rs b/proxmox-auto-installer/src/lib.rs index e69de29..7813b98 100644 --- a/proxmox-auto-installer/src/lib.rs +++ b/proxmox-auto-installer/src/lib.rs @@ -0,0 +1 @@ +pub mod answer; -- 2.39.2