proxmox-mirrors/proxmox-perl-rs
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-perl-rs synced 2025-05-25 15:33:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sdn: use new IPAM state path with fallback to legacy one

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2024-11-19 11:10:36 +01:00
parent 601a82cb64
commit 217df011c9
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pve-rs/src/firewall/sdn.rs
View File

@ -86,7 +86,8 @@ mod export {
} }
const SDN_RUNNING_CONFIG: &str = "/etc/pve/sdn/.running-config"; const SDN_RUNNING_CONFIG: &str = "/etc/pve/sdn/.running-config";
const SDN_IPAM: &str = "/etc/pve/priv/ipam.db"; const SDN_IPAM: &str = "/etc/pve/sdn/pve-ipam-state.json";
const SDN_IPAM_LEGACY: &str = "/etc/pve/priv/ipam.db"; // TODO: remove with PVE 9+
#[export] #[export]
pub fn config( pub fn config(
@ -110,16 +111,25 @@ mod export {
} }
}; };
match fs::read_to_string(SDN_IPAM) { let add_ipam_ipsets = |data: String| -> Result<(), Error> {
Ok(data) => {
let ipam_json: IpamJson = serde_json::from_str(&data)?; let ipam_json: IpamJson = serde_json::from_str(&data)?;
let ipam: Ipam = Ipam::try_from(ipam_json) let ipam: Ipam =
.with_context(|| "Failed to parse IPAM".to_string())?; Ipam::try_from(ipam_json).with_context(|| "Failed to parse IPAM".to_string())?;
let allowlist = vm_filter.map(Allowlist::from_iter); let allowlist = vm_filter.map(Allowlist::from_iter);
refs.extend_ipsets(ipam.ipsets(allowlist.as_ref())); refs.extend_ipsets(ipam.ipsets(allowlist.as_ref()));
} Ok(())
};
match fs::read_to_string(SDN_IPAM) {
Ok(data) => add_ipam_ipsets(data)?,
// Fallback to legacy path for transition from priv/ to sdn/ folder for cache/state
Err(e) if e.kind() == io::ErrorKind::NotFound => {
match fs::read_to_string(SDN_IPAM_LEGACY) {
Ok(data) => add_ipam_ipsets(data)?,
Err(e) if e.kind() == io::ErrorKind::NotFound => (), Err(e) if e.kind() == io::ErrorKind::NotFound => (),
Err(e) => bail!("Cannot open legacy IPAM database: {e:#}"),
}
}
Err(e) => { Err(e) => {
bail!("Cannot open IPAM database: {e:#}"); bail!("Cannot open IPAM database: {e:#}");
} }