From 405ad7c825f4f81ba421a376298856ec940f5744 Mon Sep 17 00:00:00 2001 From: Stefan Lendl Date: Thu, 4 Apr 2024 12:00:33 +0200 Subject: [PATCH] config: remove unnecessary pub in various methods in NetworkConfig Signed-off-by: Stefan Lendl Tested-by: Lukas Wagner Reviewed-by: Lukas Wagner Tested-by: Folke Gleumes Signed-off-by: Thomas Lamprecht --- pbs-config/src/network/mod.rs | 10 +++++----- pbs-config/src/network/parser.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pbs-config/src/network/mod.rs b/pbs-config/src/network/mod.rs index 021175353..51b09937b 100644 --- a/pbs-config/src/network/mod.rs +++ b/pbs-config/src/network/mod.rs @@ -251,7 +251,7 @@ impl NetworkConfig { } /// Check if ports are used only once - pub fn check_port_usage(&self) -> Result<(), Error> { + fn check_port_usage(&self) -> Result<(), Error> { let mut used_ports = HashMap::new(); let mut check_port_usage = |iface, ports: &Vec| { for port in ports.iter() { @@ -280,7 +280,7 @@ impl NetworkConfig { } /// Check if child mtu is less or equal than parent mtu - pub fn check_mtu(&self, parent_name: &str, child_name: &str) -> Result<(), Error> { + fn check_mtu(&self, parent_name: &str, child_name: &str) -> Result<(), Error> { let parent = self .interfaces .get(parent_name) @@ -320,7 +320,7 @@ impl NetworkConfig { } /// Check if bond slaves exists - pub fn check_bond_slaves(&self) -> Result<(), Error> { + fn check_bond_slaves(&self) -> Result<(), Error> { for (iface, interface) in self.interfaces.iter() { if let Some(slaves) = &interface.slaves { for slave in slaves.iter() { @@ -348,7 +348,7 @@ impl NetworkConfig { } /// Check if bridge ports exists - pub fn check_bridge_ports(&self) -> Result<(), Error> { + fn check_bridge_ports(&self) -> Result<(), Error> { lazy_static! { static ref VLAN_INTERFACE_REGEX: Regex = Regex::new(r"^(\S+)\.(\d+)$").unwrap(); } @@ -372,7 +372,7 @@ impl NetworkConfig { Ok(()) } - pub fn write_config(&self, w: &mut dyn Write) -> Result<(), Error> { + fn write_config(&self, w: &mut dyn Write) -> Result<(), Error> { self.check_port_usage()?; self.check_bond_slaves()?; self.check_bridge_ports()?; diff --git a/pbs-config/src/network/parser.rs b/pbs-config/src/network/parser.rs index 796e93086..e409c94ce 100644 --- a/pbs-config/src/network/parser.rs +++ b/pbs-config/src/network/parser.rs @@ -487,11 +487,11 @@ impl NetworkParser { &mut self, existing_interfaces: Option<&HashMap>, ) -> Result { - self._parse_interfaces(existing_interfaces) + self.do_parse_interfaces(existing_interfaces) .map_err(|err| format_err!("line {}: {}", self.line_nr, err)) } - pub fn _parse_interfaces( + fn do_parse_interfaces( &mut self, existing_interfaces: Option<&HashMap>, ) -> Result {