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 9574D1FF161 for ; Wed, 6 Nov 2024 15:52:15 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C41D910F8E; Wed, 6 Nov 2024 15:52:24 +0100 (CET) Date: Wed, 6 Nov 2024 15:52:21 +0100 From: Wolfgang Bumiller To: Stefan Hanreich Message-ID: References: <20241010155637.255451-1-s.hanreich@proxmox.com> <20241010155637.255451-14-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20241010155637.255451-14-s.hanreich@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.081 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH proxmox-ve-rs v2 13/25] sdn: add ipam module X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Cc: pve-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On Thu, Oct 10, 2024 at 05:56:25PM GMT, Stefan Hanreich wrote: > This module includes structs for representing the JSON schema from the > PVE ipam. Those can be used to parse the current IPAM state. > > We also include a general Ipam struct, and provide a method for > converting the PVE IPAM to the general struct. The idea behind this > is that we have multiple IPAM plugins in PVE and will likely add > support for importing them in the future. With the split, we can have > our dedicated structs for representing the different data formats from > the different IPAM plugins and then convert them into a common > representation that can then be used internally, decoupling the > concrete plugin from the code using the IPAM configuration. > > Enforcing the invariants the way we currently do adds a bit of runtime > complexity when building the object, but we get the upside of never > being able to construct an invalid struct. For the amount of entries > the ipam usually has, this should be fine. Should it turn out to be > not performant enough we could always add a HashSet for looking up > values and speeding up the validation. For now, I wanted to avoid the > additional complexity. > > Signed-off-by: Stefan Hanreich > --- > .../src/firewall/types/address.rs | 8 + > proxmox-ve-config/src/guest/vm.rs | 4 + > proxmox-ve-config/src/sdn/ipam.rs | 330 ++++++++++++++++++ > proxmox-ve-config/src/sdn/mod.rs | 2 + > 4 files changed, 344 insertions(+) > create mode 100644 proxmox-ve-config/src/sdn/ipam.rs > > diff --git a/proxmox-ve-config/src/firewall/types/address.rs b/proxmox-ve-config/src/firewall/types/address.rs > index 6978a8f..a7bb6ad 100644 > --- a/proxmox-ve-config/src/firewall/types/address.rs > +++ b/proxmox-ve-config/src/firewall/types/address.rs > @@ -61,6 +61,14 @@ impl Cidr { > pub fn is_ipv6(&self) -> bool { > matches!(self, Cidr::Ipv6(_)) > } > + > + pub fn contains_address(&self, ip: &IpAddr) -> bool { > + match (self, ip) { > + (Cidr::Ipv4(cidr), IpAddr::V4(ip)) => cidr.contains_address(ip), > + (Cidr::Ipv6(cidr), IpAddr::V6(ip)) => cidr.contains_address(ip), > + _ => false, > + } > + } > } > > impl fmt::Display for Cidr { > diff --git a/proxmox-ve-config/src/guest/vm.rs b/proxmox-ve-config/src/guest/vm.rs > index ed6c66a..3476b93 100644 > --- a/proxmox-ve-config/src/guest/vm.rs > +++ b/proxmox-ve-config/src/guest/vm.rs > @@ -18,6 +18,10 @@ static LOCAL_PART: [u8; 8] = [0xFE, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]; > static EUI64_MIDDLE_PART: [u8; 2] = [0xFF, 0xFE]; > > impl MacAddress { > + pub fn new(address: [u8; 6]) -> Self { > + Self(address) > + } > + > /// generates a link local IPv6-address according to RFC 4291 (Appendix A) > pub fn eui64_link_local_address(&self) -> Ipv6Addr { > let head = &self.0[..3]; > diff --git a/proxmox-ve-config/src/sdn/ipam.rs b/proxmox-ve-config/src/sdn/ipam.rs > new file mode 100644 > index 0000000..682bbe7 > --- /dev/null > +++ b/proxmox-ve-config/src/sdn/ipam.rs > @@ -0,0 +1,330 @@ > +use std::{ > + collections::{BTreeMap, HashMap}, > + error::Error, > + fmt::Display, > + net::IpAddr, > +}; > + > +use serde::Deserialize; > + > +use crate::{ > + firewall::types::Cidr, > + guest::{types::Vmid, vm::MacAddress}, > + sdn::{SdnNameError, SubnetName, ZoneName}, > +}; > + > +/// struct for deserializing a gateway entry in PVE IPAM Max already mentioned it: docs are full sentences, so capitalize & end with a `.` please. _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel