From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.lendl@proxmox.com>
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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 9836694EA4
for <pve-devel@lists.proxmox.com>; Fri, 23 Feb 2024 15:27:06 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 817DC19E93
for <pve-devel@lists.proxmox.com>; Fri, 23 Feb 2024 15:27:06 +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 <pve-devel@lists.proxmox.com>; Fri, 23 Feb 2024 15:27:05 +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 3D69244EFC
for <pve-devel@lists.proxmox.com>; Fri, 23 Feb 2024 15:27:05 +0100 (CET)
From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
In-Reply-To: <20240123170053.490250-9-a.lauterer@proxmox.com>
References: <20240123170053.490250-1-a.lauterer@proxmox.com>
<20240123170053.490250-9-a.lauterer@proxmox.com>
Date: Fri, 23 Feb 2024 15:27:04 +0100
Message-ID: <87wmqv8ddz.fsf@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.033 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
T_SCC_BODY_TEXT_LINE -0.01 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [lib.rs, answer.rs]
Subject: Re: [pve-devel] [PATCH v1 installer 08/18] 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 23 Feb 2024 14:27:06 -0000
Aaron Lauterer <a.lauterer@proxmox.com> writes:
> Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
> ---
> proxmox-auto-installer/src/answer.rs | 147 +++++++++++++++++++++++++++
> proxmox-auto-installer/src/lib.rs | 1 +
> 2 files changed, 148 insertions(+)
> create mode 100644 proxmox-auto-installer/src/answer.rs
>
> diff --git a/proxmox-auto-installer/src/answer.rs b/proxmox-auto-installer/src/answer.rs
> new file mode 100644
> index 0000000..0f6c593
> --- /dev/null
> +++ b/proxmox-auto-installer/src/answer.rs
> @@ -0,0 +1,147 @@
> +use serde::{Deserialize, Serialize};
> +use std::collections::BTreeMap;
> +
> +#[derive(Clone, Deserialize, Debug)]
> +#[serde(rename_all = "lowercase")]
> +pub struct Answer {
> + pub global: Global,
> + pub network: Network,
> + pub disks: Disks,
> +}
> +
> +#[derive(Clone, Deserialize, Debug)]
> +pub struct Global {
> + pub country: String,
> + pub fqdn: String,
> + pub keyboard: String,
> + pub mailto: String,
> + pub timezone: String,
> + pub password: String,
> + pub pre_command: Option<Vec<String>>,
> + pub post_command: Option<Vec<String>>,
> + pub reboot_on_error: Option<bool>,
> +}
> +
> +#[derive(Clone, Deserialize, Debug)]
> +pub struct Network {
> + pub use_dhcp: Option<bool>,
> + pub cidr: Option<String>,
> + pub dns: Option<String>,
> + pub gateway: Option<String>,
> + // use BTreeMap to have keys sorted
> + pub filter: Option<BTreeMap<String, String>>,
> +}
> +
> +#[derive(Clone, Deserialize, Debug)]
> +pub struct Disks {
> + pub filesystem: Option<Filesystem>,
> + pub disk_selection: Option<Vec<String>>,
> + pub filter_match: Option<FilterMatch>,
> + // use BTreeMap to have keys sorted
> + pub filter: Option<BTreeMap<String, String>>,
> + pub zfs: Option<ZfsOptions>,
> + pub lvm: Option<LvmOptions>,
> + pub btrfs: Option<BtrfsOptions>,
> +}
instead of individual zfs, lvm and btrfs options you could have an enum
like this.
enum FsOptions{
Zfs(ZfsOptions),
Lvm(LvmOptions),
Btrfs(BtrfsOptions),
None,
}
This would also serve the purpose of the Filesystem prop.
> +
> +#[derive(Clone, Deserialize, Debug, PartialEq)]
> +#[serde(rename_all = "lowercase")]
> +pub enum FilterMatch {
> + Any,
> + All,
> +}
> +
> +#[derive(Clone, Deserialize, Serialize, Debug)]
> +#[serde(rename_all = "kebab-case")]
> +pub enum Filesystem {
> + Ext4,
> + Xfs,
> + ZfsRaid0,
> + ZfsRaid1,
> + ZfsRaid10,
> + ZfsRaidZ1,
> + ZfsRaidZ2,
> + ZfsRaidZ3,
> + BtrfsRaid0,
> + BtrfsRaid1,
> + BtrfsRaid10,
> +}
This could also be sth like:
Zfs { toplogy: ZfsTopolgy, options: ZfsOptions },
Btrfs { toplogy: BtrfsTopology, options: BtrfsOptions },
...
> +
> +#[derive(Clone, Deserialize, Debug)]
> +pub struct ZfsOptions {
> + pub ashift: Option<usize>,
> + pub arc_max: Option<usize>,
> + pub checksum: Option<ZfsChecksumOption>,
> + pub compress: Option<ZfsCompressOption>,
> + pub copies: Option<usize>,
> + pub hdsize: Option<f64>,
> +}
> +
> +impl ZfsOptions {
> + pub fn new() -> ZfsOptions {
> + ZfsOptions {
> + ashift: None,
> + arc_max: None,
> + checksum: None,
> + compress: None,
> + copies: None,
> + hdsize: None,
> + }
> + }
> +}
> +
> +#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Deserialize)]
> +#[serde(rename_all(deserialize = "lowercase"))]
> +pub enum ZfsCompressOption {
> + #[default]
> + On,
> + Off,
> + Lzjb,
> + Lz4,
> + Zle,
> + Gzip,
> + Zstd,
> +}
> +
> +#[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Deserialize)]
> +#[serde(rename_all = "kebab-case")]
> +pub enum ZfsChecksumOption {
> + #[default]
> + On,
> + Off,
> + Fletcher2,
> + Fletcher4,
> + Sha256,
> +}
> +
> +#[derive(Clone, Deserialize, Serialize, Debug)]
> +pub struct LvmOptions {
> + pub hdsize: Option<f64>,
> + pub swapsize: Option<f64>,
> + pub maxroot: Option<f64>,
> + pub maxvz: Option<f64>,
> + pub minfree: Option<f64>,
> +}
> +
> +impl LvmOptions {
> + pub fn new() -> LvmOptions {
> + LvmOptions {
> + hdsize: None,
> + swapsize: None,
> + maxroot: None,
> + maxvz: None,
> + minfree: None,
> + }
> + }
> +}
> +
> +#[derive(Clone, Deserialize, Serialize, Debug)]
> +pub struct BtrfsOptions {
> + pub hdsize: Option<f64>,
> +}
> +
> +impl BtrfsOptions {
> + pub fn new() -> BtrfsOptions {
> + BtrfsOptions { hdsize: None }
> + }
> +}
> 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;