From: Stefan Lendl <s.lendl@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v2 5/9] config: remove unnecessary pub in various methods in NetworkConfig
Date: Thu, 18 Jan 2024 16:44:20 +0100 [thread overview]
Message-ID: <20240118154424.794624-6-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240118154424.794624-1-s.lendl@proxmox.com>
Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
Reviewd-by: Lukas Wagner <l.wagner@proxmox.com>
---
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 02117535..51b09937 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<String>| {
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 5a83e192..c6992bd3 100644
--- a/pbs-config/src/network/parser.rs
+++ b/pbs-config/src/network/parser.rs
@@ -487,11 +487,11 @@ impl<R: BufRead> NetworkParser<R> {
&mut self,
existing_interfaces: Option<&HashMap<String, bool>>,
) -> Result<NetworkConfig, Error> {
- 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<String, bool>>,
) -> Result<NetworkConfig, Error> {
--
2.42.0
next prev parent reply other threads:[~2024-01-18 15:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-18 15:44 [pbs-devel] [PATCH widget-toolkit/proxmox-backup v2 0/9] Fix #3115: VLAN Network Interface Configuration Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 1/9] tests: move network tests to parser.rs Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 2/9] tests: rudimentary NetworkConfig.write_config tests Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 3/9] config: write vlan network interface Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 4/9] config: parse vlan interface from config Stefan Lendl
2024-01-18 15:44 ` Stefan Lendl [this message]
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 6/9] fmt: fix intendation in api macro Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 7/9] api: create and update vlan interfaces Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH proxmox-backup v2 8/9] ui: enable vlan widget Stefan Lendl
2024-01-18 15:44 ` [pbs-devel] [PATCH widget-toolkit v2 9/9] form: include VlanField from PVE Stefan Lendl
2024-03-07 13:42 ` [pbs-devel] [PATCH widget-toolkit/proxmox-backup v2 0/9] Fix #3115: VLAN Network Interface Configuration Stefan Lendl
2024-04-04 13:55 ` Stefan Lendl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240118154424.794624-6-s.lendl@proxmox.com \
--to=s.lendl@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.