From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 708671FF15C for <inbox@lore.proxmox.com>; Wed, 5 Mar 2025 11:20:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 61D21124B0; Wed, 5 Mar 2025 11:20:41 +0100 (CET) Date: Wed, 5 Mar 2025 11:20:06 +0100 From: Gabriel Goller <g.goller@proxmox.com> To: Stefan Hanreich <s.hanreich@proxmox.com> Message-ID: <txn5jrbkmf7zytmesiziolqyi6aurgdzj7kca7s66advfhykwy@h46g2drbbq2x> Mail-Followup-To: Stefan Hanreich <s.hanreich@proxmox.com>, Proxmox VE development discussion <pve-devel@lists.proxmox.com> References: <20250214133951.344500-1-g.goller@proxmox.com> <20250214133951.344500-5-g.goller@proxmox.com> <08c86c9f-e442-4497-8fee-aac0ce846136@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <08c86c9f-e442-4497-8fee-aac0ce846136@proxmox.com> User-Agent: NeoMutt/20241002-35-39f9a6 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.029 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [n.net] Subject: Re: [pve-devel] [PATCH proxmox-perl-rs 04/11] fabrics: add CRUD and generate fabrics methods 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> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Cc: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> >> [snip] >> + impl PerlSectionConfig<OpenFabricSectionConfig> { >> + pub fn add_fabric(&self, new_config: AddFabric) -> Result<(), anyhow::Error> { >> + let fabricid = FabricId::from(new_config.name).to_string(); > >Could we simplify this method and the ones below by just using the >concrete types (here FabricId) inside the argument structs (AddFabric)? >There's potential for quite a few here afaict, also with the >Option<u16>'s. Would save us a lot of conversion / validation logic if >we just did it at deserialization. Yep, that would work. We just need to change the serde deserialize override to be generic. >I pointed out some instances below. > >I guess the error messages would be a bit worse then? Nope, they are quite the same. We can just wrap them in serde custom errors. >> + let new_fabric = OpenFabricSectionConfig::Fabric(FabricSection { >> + hello_interval: new_config >> + .hello_interval >> + .map(|x| x.try_into()) >> + .transpose()?, >> + }); >> + let mut config = self.section_config.lock().unwrap(); >> + if config.sections.contains_key(&fabricid) { >> + anyhow::bail!("fabric already exists"); >> + } >> + config.sections.insert(fabricid, new_fabric); > >try_insert instead of contains_key + insert? still deprecated :) >> [snip] >> + let mut config = self.section_config.lock().unwrap(); >> + if !config.sections.contains_key(&nodeid) { >> + anyhow::bail!("node not found"); >> + } >> + config.sections.entry(nodeid).and_modify(|n| { >> + if let OpenFabricSectionConfig::Node(n) = n { >> + n.net = net; >> + n.interface = interfaces; >> + } >> + }); > >wouldn't get_mut be easier here? also would save the extra contains_key Agree, also changed everywhere else. Thanks! _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel