From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id AE6C81FF16B for ; Tue, 29 Jul 2025 18:56:07 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 75AF118D22; Tue, 29 Jul 2025 18:57:31 +0200 (CEST) From: Stefan Hanreich To: pbs-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 18:56:49 +0200 Message-ID: <20250729165655.681368-5-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729165655.681368-1-s.hanreich@proxmox.com> References: <20250729165655.681368-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.195 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an 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. [mod.rs, interface.name] Subject: [pbs-devel] [PATCH proxmox 3/3] network-api: add rename_interfaces method X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" Used for batch renaming interfaces in the /e/n/i configuration file by the proxmox-network-interface-pinning tool. Signed-off-by: Stefan Hanreich --- proxmox-network-api/src/config/mod.rs | 68 +++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/proxmox-network-api/src/config/mod.rs b/proxmox-network-api/src/config/mod.rs index e8cb81d1..3b2ffdc2 100644 --- a/proxmox-network-api/src/config/mod.rs +++ b/proxmox-network-api/src/config/mod.rs @@ -267,6 +267,74 @@ impl NetworkConfig { Ok(interface) } + pub fn rename_interfaces(&mut self, mapping: &HashMap) -> Result<(), Error> { + for (old_name, new_name) in mapping.iter() { + self.interfaces + .remove(old_name) + .map(|interface| self.interfaces.insert(new_name.to_string(), interface)); + + if let Some(idx) = self + .order + .iter() + .position(|elem| matches!(elem, NetworkOrderEntry::Iface(name) if name == new_name)) + { + self.order[idx] = NetworkOrderEntry::Iface(new_name.to_string()); + } + } + + for interface in self.interfaces.values_mut() { + if let Some(new_name) = mapping.get(&interface.name) { + interface.name = new_name.to_string(); + } + + if let Some(bridge_ports) = interface.bridge_ports.take() { + interface.bridge_ports = Some( + bridge_ports + .into_iter() + .map(|interface| { + mapping + .get(&interface) + .map(String::from) + .unwrap_or(interface) + }) + .collect(), + ) + } + + if let Some(vlan_raw_device) = interface.vlan_raw_device.take() { + if let Some(new_name) = mapping.get(&vlan_raw_device) { + interface.vlan_raw_device = Some(new_name.to_string()); + } else { + interface.vlan_raw_device = Some(vlan_raw_device); + } + } + + if let Some(slaves) = interface.slaves.take() { + interface.slaves = Some( + slaves + .into_iter() + .map(|interface| { + mapping + .get(&interface) + .map(String::from) + .unwrap_or(interface) + }) + .collect(), + ) + } + + if let Some(bond_primary) = interface.bond_primary.take() { + if let Some(new_name) = mapping.get(&bond_primary) { + interface.bond_primary = Some(new_name.to_string()); + } else { + interface.bond_primary = Some(bond_primary); + } + } + } + + Ok(()) + } + /// Check that there is no other gateway. /// /// The gateway property is only allowed on passed 'iface'. This should be -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel