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 DA80593CCD for ; Wed, 21 Feb 2024 12:08:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C1CAE1542C for ; Wed, 21 Feb 2024 12:08:07 +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 ; Wed, 21 Feb 2024 12:08:07 +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 EEB854445A for ; Wed, 21 Feb 2024 12:08:06 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Wed, 21 Feb 2024 12:07:46 +0100 Message-Id: <20240221110805.931925-4-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240221110805.931925-1-a.lauterer@proxmox.com> References: <20240221110805.931925-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.064 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 - Subject: [pve-devel] [PATCH v2 03/22] common: tui: use BTreeMap for predictable ordering 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: Wed, 21 Feb 2024 11:08:07 -0000 necessary for the disk selection and network interfaces maps to have tests with results that can be compared without much additional effort. Signed-off-by: Aaron Lauterer --- proxmox-installer-common/src/setup.rs | 8 ++++---- proxmox-tui-installer/src/options.rs | 4 ++-- proxmox-tui-installer/src/setup.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxmox-installer-common/src/setup.rs b/proxmox-installer-common/src/setup.rs index 1bc4cb7..8432a2c 100644 --- a/proxmox-installer-common/src/setup.rs +++ b/proxmox-installer-common/src/setup.rs @@ -1,6 +1,6 @@ use std::{ cmp, - collections::HashMap, + collections::{BTreeMap, HashMap}, fmt, fs::File, io::{self, BufReader}, @@ -297,7 +297,7 @@ pub struct NetworkInfo { /// Maps devices to their configuration, if it has a usable configuration. /// (Contains no entries for devices with only link-local addresses.) #[serde(default)] - pub interfaces: HashMap, + pub interfaces: BTreeMap, /// The hostname of this machine, if set by the DHCP server. pub hostname: Option, @@ -416,8 +416,8 @@ pub struct InstallConfig { skip_serializing_if = "Option::is_none" )] pub target_hd: Option, - #[serde(skip_serializing_if = "HashMap::is_empty")] - pub disk_selection: HashMap, + #[serde(skip_serializing_if = "BTreeMap::is_empty")] + pub disk_selection: BTreeMap, pub country: String, pub timezone: String, diff --git a/proxmox-tui-installer/src/options.rs b/proxmox-tui-installer/src/options.rs index 094a430..73fbf2a 100644 --- a/proxmox-tui-installer/src/options.rs +++ b/proxmox-tui-installer/src/options.rs @@ -76,7 +76,7 @@ mod tests { utils::{CidrAddress, Fqdn}, }; use std::net::{IpAddr, Ipv4Addr}; - use std::{collections::HashMap, path::PathBuf}; + use std::{collections::BTreeMap, path::PathBuf}; fn dummy_setup_info() -> SetupInfo { SetupInfo { @@ -99,7 +99,7 @@ mod tests { fn network_options_from_setup_network_info() { let setup = dummy_setup_info(); - let mut interfaces = HashMap::new(); + let mut interfaces = BTreeMap::new(); interfaces.insert( "eth0".to_owned(), Interface { diff --git a/proxmox-tui-installer/src/setup.rs b/proxmox-tui-installer/src/setup.rs index e816c12..248f86e 100644 --- a/proxmox-tui-installer/src/setup.rs +++ b/proxmox-tui-installer/src/setup.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use std::collections::BTreeMap; use crate::options::InstallerOptions; use proxmox_installer_common::{ @@ -19,7 +19,7 @@ impl From for InstallConfig { maxvz: None, zfs_opts: None, target_hd: None, - disk_selection: HashMap::new(), + disk_selection: BTreeMap::new(), country: options.timezone.country, timezone: options.timezone.timezone, -- 2.39.2