mirror of
https://git.proxmox.com/git/proxmox-ve-rs
synced 2025-10-04 14:51:00 +00:00
sdn: ipam: add method for generating ipsets
For every guest that has at least one entry in the IPAM we generate an ipset with the name `+sdn/guest-ipam-{vmid}`. The ipset contains all IPs from all zones for a guest with {vmid}. Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
This commit is contained in:
parent
85cabbf13c
commit
ef06847b72
@ -108,6 +108,15 @@ impl From<Ipv6Cidr> for Cidr {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<IpAddr> for Cidr {
|
||||||
|
fn from(value: IpAddr) -> Self {
|
||||||
|
match value {
|
||||||
|
IpAddr::V4(addr) => Ipv4Cidr::from(addr).into(),
|
||||||
|
IpAddr::V6(addr) => Ipv6Cidr::from(addr).into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const IPV4_LENGTH: u8 = 32;
|
const IPV4_LENGTH: u8 = 32;
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
|
#[derive(Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
|
||||||
|
@ -8,7 +8,11 @@ use std::{
|
|||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
firewall::types::Cidr,
|
common::Allowlist,
|
||||||
|
firewall::types::{
|
||||||
|
ipset::{IpsetEntry, IpsetScope},
|
||||||
|
Cidr, Ipset,
|
||||||
|
},
|
||||||
guest::{types::Vmid, vm::MacAddress},
|
guest::{types::Vmid, vm::MacAddress},
|
||||||
sdn::{SdnNameError, SubnetName, ZoneName},
|
sdn::{SdnNameError, SubnetName, ZoneName},
|
||||||
};
|
};
|
||||||
@ -309,6 +313,40 @@ impl Ipam {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Ipam {
|
||||||
|
/// Generates an [`Ipset`] for all guests with at least one entry in the IPAM.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// * `filter` - A [`Allowlist<Vmid>`] for which IPsets should get returned
|
||||||
|
///
|
||||||
|
/// It contains all IPs in all VNets, that a guest has stored in IPAM.
|
||||||
|
/// Ipset name is of the form `guest-ipam-<vmid>`
|
||||||
|
pub fn ipsets(&self, filter: Option<&Allowlist<Vmid>>) -> impl Iterator<Item = Ipset> + '_ {
|
||||||
|
self.entries
|
||||||
|
.iter()
|
||||||
|
.flat_map(|(_, entries)| entries.iter())
|
||||||
|
.filter_map(|entry| {
|
||||||
|
if let IpamData::Vm(data) = &entry.data() {
|
||||||
|
if filter.is_none_or(|list| list.is_allowed(&data.vmid)) {
|
||||||
|
return Some(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
None
|
||||||
|
})
|
||||||
|
.fold(HashMap::<Vmid, Ipset>::new(), |mut acc, entry| {
|
||||||
|
acc.entry(entry.vmid)
|
||||||
|
.or_insert_with(|| {
|
||||||
|
Ipset::from_parts(IpsetScope::Sdn, format!("guest-ipam-{}", entry.vmid))
|
||||||
|
})
|
||||||
|
.push(IpsetEntry::from(entry.ip));
|
||||||
|
|
||||||
|
acc
|
||||||
|
})
|
||||||
|
.into_values()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl TryFrom<IpamJson> for Ipam {
|
impl TryFrom<IpamJson> for Ipam {
|
||||||
type Error = IpamError;
|
type Error = IpamError;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user