* [pve-devel] [PATCH proxmox 1/1] serde: add string_as_bool module for boolean string parsing
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate Gabriel Goller
` (52 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Add new module to proxmox-serde that parses boolean values from various
string formats. Provides parse_bool function supporting common
representations (0/1, true/false, on/off, yes/no) along with
serializer/deserializer for these formats.
Note: this was copied over from proxmox-ve-config/firewall.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
proxmox-serde/src/lib.rs | 84 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 84 insertions(+)
diff --git a/proxmox-serde/src/lib.rs b/proxmox-serde/src/lib.rs
index c162834905c2..705ad430c953 100644
--- a/proxmox-serde/src/lib.rs
+++ b/proxmox-serde/src/lib.rs
@@ -260,3 +260,87 @@ pub mod string_as_base64url_nopad {
String::from_utf8(bytes).map_err(|err| Error::custom(err.to_string()))
}
}
+
+/// Parse a bool from a string
+pub mod string_as_bool {
+ use std::fmt;
+
+ use serde::{
+ de::{Deserializer, Error, Visitor},
+ ser::Serializer,
+ };
+
+ /// Parse a boolean.
+ ///
+ /// values that parse as [`false`]: 0, false, off, no
+ /// values that parse as [`true`]: 1, true, on, yes
+ ///
+ /// # Examples
+ /// ```ignore
+ /// assert_eq!(parse_bool("false"), Ok(false));
+ /// assert_eq!(parse_bool("on"), Ok(true));
+ /// assert!(parse_bool("proxmox").is_err());
+ /// ```
+ pub fn parse_bool(value: &str) -> Result<bool, anyhow::Error> {
+ Ok(
+ if value == "0"
+ || value.eq_ignore_ascii_case("false")
+ || value.eq_ignore_ascii_case("off")
+ || value.eq_ignore_ascii_case("no")
+ {
+ false
+ } else if value == "1"
+ || value.eq_ignore_ascii_case("true")
+ || value.eq_ignore_ascii_case("on")
+ || value.eq_ignore_ascii_case("yes")
+ {
+ true
+ } else {
+ anyhow::bail!("not a boolean: {value:?}");
+ },
+ )
+ }
+
+ pub fn deserialize<'de, D: Deserializer<'de>>(
+ deserializer: D,
+ ) -> Result<Option<bool>, D::Error> {
+ struct V;
+
+ impl<'de> Visitor<'de> for V {
+ type Value = Option<bool>;
+
+ fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ f.write_str("a boolean-like value")
+ }
+
+ fn visit_bool<E: Error>(self, v: bool) -> Result<Self::Value, E> {
+ Ok(Some(v))
+ }
+
+ fn visit_str<E: Error>(self, v: &str) -> Result<Self::Value, E> {
+ parse_bool(v).map_err(E::custom).map(Some)
+ }
+
+ fn visit_none<E: Error>(self) -> Result<Self::Value, E> {
+ Ok(None)
+ }
+
+ fn visit_some<D>(self, deserializer: D) -> Result<Self::Value, D::Error>
+ where
+ D: Deserializer<'de>,
+ {
+ deserializer.deserialize_any(self)
+ }
+ }
+
+ deserializer.deserialize_any(V)
+ }
+
+ pub fn serialize<S: Serializer>(from: &Option<bool>, serializer: S) -> Result<S::Ok, S::Error> {
+ if *from == Some(true) {
+ serializer.serialize_str("1")
+ } else {
+ serializer.serialize_str("0")
+ }
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox 1/1] serde: add string_as_bool module for boolean string parsing Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-31 14:09 ` Thomas Lamprecht
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 02/17] network-types: add common hostname and openfabric types Gabriel Goller
` (51 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
This is a common crate that is gonna be reused between
proxmox-ve-config, proxmox-frr and proxmox-perl-rs. It holds different
networking primitives, such as Ipv4/Ipv6-Cidr, NET and e.g.
HelloInterval (openfabric attribute) types. The decision for creating
this crate is two-fold:
- we didn't want to import Ipv4Cidr (& Co) from
proxmox-ve-config/firewall
- having proxmox-frr rely on proxmox-ve-config would be weird and
wouldn't make proxmox-frr a 'real' standalone FRR-types crate.
By moving the Ipv4Cidr (& Co) types here, we also need to update the
proxmox-firewall crate.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.gitignore | 1 +
Cargo.toml | 6 ++++
proxmox-network-types/Cargo.toml | 15 ++++++++
proxmox-network-types/debian/changelog | 5 +++
proxmox-network-types/debian/control | 41 ++++++++++++++++++++++
proxmox-network-types/debian/copyright | 18 ++++++++++
proxmox-network-types/debian/debcargo.toml | 7 ++++
proxmox-network-types/src/lib.rs | 0
8 files changed, 93 insertions(+)
create mode 100644 proxmox-network-types/Cargo.toml
create mode 100644 proxmox-network-types/debian/changelog
create mode 100644 proxmox-network-types/debian/control
create mode 100644 proxmox-network-types/debian/copyright
create mode 100644 proxmox-network-types/debian/debcargo.toml
create mode 100644 proxmox-network-types/src/lib.rs
diff --git a/.gitignore b/.gitignore
index d72b68bc67ef..7a1742e28c7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ Cargo.lock
/*.changes
/build
/*-deb
+rust-analyzer.toml
diff --git a/Cargo.toml b/Cargo.toml
index dc7f312fb8a9..82f7fe257615 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
[workspace]
members = [
"proxmox-ve-config",
+ "proxmox-network-types",
]
exclude = [
"build",
@@ -15,3 +16,8 @@ homepage = "https://proxmox.com"
exclude = [ "debian" ]
rust-version = "1.82"
+[workspace.dependencies]
+proxmox-section-config = "2.1.1"
+serde = "1"
+serde_with = "3.8.1"
+thiserror = "2"
diff --git a/proxmox-network-types/Cargo.toml b/proxmox-network-types/Cargo.toml
new file mode 100644
index 000000000000..93f4df87a59f
--- /dev/null
+++ b/proxmox-network-types/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "proxmox-network-types"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+exclude.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+thiserror = { workspace = true }
+anyhow = "1"
+serde = { workspace = true, features = [ "derive" ] }
+serde_with = { workspace = true }
diff --git a/proxmox-network-types/debian/changelog b/proxmox-network-types/debian/changelog
new file mode 100644
index 000000000000..5390793cfa07
--- /dev/null
+++ b/proxmox-network-types/debian/changelog
@@ -0,0 +1,5 @@
+rust-proxmox-network-types (0.1.0) unstable; urgency=medium
+
+ * Initial release.
+
+ -- Proxmox Support Team <support@proxmox.com> Mon, 03 Jun 2024 10:51:11 +0200
diff --git a/proxmox-network-types/debian/control b/proxmox-network-types/debian/control
new file mode 100644
index 000000000000..f0727ec1d7cf
--- /dev/null
+++ b/proxmox-network-types/debian/control
@@ -0,0 +1,41 @@
+Source: rust-proxmox-network-types
+Section: rust
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+ dh-sequence-cargo
+Build-Depends-Arch: cargo:native <!nocheck>,
+ rustc:native (>= 1.82) <!nocheck>,
+ libstd-rust-dev <!nocheck>,
+ librust-anyhow-1+default-dev <!nocheck>,
+ librust-serde-1+default-dev <!nocheck>,
+ librust-serde-1+derive-dev <!nocheck>,
+ librust-serde-with-3+default-dev (>= 3.8.1-~~) <!nocheck>,
+ librust-thiserror-2+default-dev <!nocheck>
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Standards-Version: 4.7.0
+Vcs-Git: git://git.proxmox.com/git/proxmox-ve-rs.git
+Vcs-Browser: https://git.proxmox.com/?p=proxmox-ve-rs.git
+Homepage: https://proxmox.com
+X-Cargo-Crate: proxmox-network-types
+Rules-Requires-Root: no
+
+Package: librust-proxmox-network-types-dev
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ librust-anyhow-1+default-dev,
+ librust-serde-1+default-dev,
+ librust-serde-1+derive-dev,
+ librust-serde-with-3+default-dev (>= 3.8.1-~~),
+ librust-thiserror-2+default-dev
+Provides:
+ librust-proxmox-network-types+default-dev (= ${binary:Version}),
+ librust-proxmox-network-types-0-dev (= ${binary:Version}),
+ librust-proxmox-network-types-0+default-dev (= ${binary:Version}),
+ librust-proxmox-network-types-0.1-dev (= ${binary:Version}),
+ librust-proxmox-network-types-0.1+default-dev (= ${binary:Version}),
+ librust-proxmox-network-types-0.1.0-dev (= ${binary:Version}),
+ librust-proxmox-network-types-0.1.0+default-dev (= ${binary:Version})
+Description: Rust crate "proxmox-network-types" - Rust source code
+ Source code for Debianized Rust crate "proxmox-network-types"
diff --git a/proxmox-network-types/debian/copyright b/proxmox-network-types/debian/copyright
new file mode 100644
index 000000000000..1ea8a56b4f58
--- /dev/null
+++ b/proxmox-network-types/debian/copyright
@@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files:
+ *
+Copyright: 2019 - 2025 Proxmox Server Solutions GmbH <support@proxmox.com>
+License: AGPL-3.0-or-later
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU Affero General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Affero General Public License along
+ with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/proxmox-network-types/debian/debcargo.toml b/proxmox-network-types/debian/debcargo.toml
new file mode 100644
index 000000000000..87a787e6d03e
--- /dev/null
+++ b/proxmox-network-types/debian/debcargo.toml
@@ -0,0 +1,7 @@
+overlay = "."
+crate_src_path = ".."
+maintainer = "Proxmox Support Team <support@proxmox.com>"
+
+[source]
+vcs_git = "git://git.proxmox.com/git/proxmox-ve-rs.git"
+vcs_browser = "https://git.proxmox.com/?p=proxmox-ve-rs.git"
diff --git a/proxmox-network-types/src/lib.rs b/proxmox-network-types/src/lib.rs
new file mode 100644
index 000000000000..e69de29bb2d1
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate Gabriel Goller
@ 2025-03-31 14:09 ` Thomas Lamprecht
2025-03-31 14:38 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Thomas Lamprecht @ 2025-03-31 14:09 UTC (permalink / raw)
To: Proxmox VE development discussion, Gabriel Goller
Am 28.03.25 um 18:12 schrieb Gabriel Goller:
> This is a common crate that is gonna be reused between
> proxmox-ve-config, proxmox-frr and proxmox-perl-rs. It holds different
> networking primitives, such as Ipv4/Ipv6-Cidr, NET and e.g.
> HelloInterval (openfabric attribute) types. The decision for creating
> this crate is two-fold:
>
> - we didn't want to import Ipv4Cidr (& Co) from
> proxmox-ve-config/firewall
> - having proxmox-frr rely on proxmox-ve-config would be weird and
> wouldn't make proxmox-frr a 'real' standalone FRR-types crate.
>
> By moving the Ipv4Cidr (& Co) types here, we also need to update the
> proxmox-firewall crate.
I'm fine with a dedicated crate, but I'm wondering if either this is
the wrong repo and it should live in the general proxmox workspace or
if it should be named `proxmox-ve-network-types`.
Another alternative might be to split out the generic stuff – hostname
and CIDR – to a generic crate – existing or new – in proxmox workspace
and then create a proxmox-sdn-types one – probably also in the proxmox
workspace for easier re-use in clients.
Splitting the types that are quite SDN specific and those that are
rather generic networking types might feel a bit more logical if one
looks outside the SDN side of networking use cases.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate
2025-03-31 14:09 ` Thomas Lamprecht
@ 2025-03-31 14:38 ` Stefan Hanreich
2025-03-31 16:20 ` Thomas Lamprecht
0 siblings, 1 reply; 97+ messages in thread
From: Stefan Hanreich @ 2025-03-31 14:38 UTC (permalink / raw)
To: Proxmox VE development discussion, Thomas Lamprecht, Gabriel Goller
On 3/31/25 16:09, Thomas Lamprecht wrote:
> Am 28.03.25 um 18:12 schrieb Gabriel Goller:
>> This is a common crate that is gonna be reused between
>> proxmox-ve-config, proxmox-frr and proxmox-perl-rs. It holds different
>> networking primitives, such as Ipv4/Ipv6-Cidr, NET and e.g.
>> HelloInterval (openfabric attribute) types. The decision for creating
>> this crate is two-fold:
>>
>> - we didn't want to import Ipv4Cidr (& Co) from
>> proxmox-ve-config/firewall
>> - having proxmox-frr rely on proxmox-ve-config would be weird and
>> wouldn't make proxmox-frr a 'real' standalone FRR-types crate.
>>
>> By moving the Ipv4Cidr (& Co) types here, we also need to update the
>> proxmox-firewall crate.
>
> I'm fine with a dedicated crate, but I'm wondering if either this is
> the wrong repo and it should live in the general proxmox workspace or
> if it should be named `proxmox-ve-network-types`.
>
> Another alternative might be to split out the generic stuff – hostname
> and CIDR – to a generic crate – existing or new – in proxmox workspace
> and then create a proxmox-sdn-types one – probably also in the proxmox
> workspace for easier re-use in clients.
> Splitting the types that are quite SDN specific and those that are
> rather generic networking types might feel a bit more logical if one
> looks outside the SDN side of networking use cases.
Yes, the second approach sounds sensible imo, the OpenFabric / OSPF
types are quite specific...
Christoph also expressed interested in the network-types (for the
installer) so moving the general ones to a crate in proxmox is fine by
me and there are probably even more places where we could use them (PDM
SDN integration will probably sooner or later make use of them as well).
So we'll split it into two and include that in a v2!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate
2025-03-31 14:38 ` Stefan Hanreich
@ 2025-03-31 16:20 ` Thomas Lamprecht
0 siblings, 0 replies; 97+ messages in thread
From: Thomas Lamprecht @ 2025-03-31 16:20 UTC (permalink / raw)
To: Stefan Hanreich, Proxmox VE development discussion, Gabriel Goller
Am 31.03.25 um 16:38 schrieb Stefan Hanreich:
> Yes, the second approach sounds sensible imo, the OpenFabric / OSPF
> types are quite specific...
>
> Christoph also expressed interested in the network-types (for the
> installer) so moving the general ones to a crate in proxmox is fine by
> me and there are probably even more places where we could use them (PDM
> SDN integration will probably sooner or later make use of them as well).
>
> So we'll split it into two and include that in a v2!
FWIW, as this is basically the most referenced blocker feel free^W
encouraged to send that as separate series out faster, so it can be
applied already upfront. I mean, some actual review of the types
naturally would be great, but a full v2 of the whole series is not
required to see how they and the code using them interacts with each
other.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH proxmox-ve-rs 02/17] network-types: add common hostname and openfabric types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox 1/1] serde: add string_as_bool module for boolean string parsing Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 03/17] network-types: add openfabric NET type Gabriel Goller
` (50 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
The Hostname type will be used as a type for a pve hostname. It it used
in the NodeId, which connects the pve-host with the fabric. The
openfabric options are HelloInterval, CsnpInterval and HelloMultiplier.
These are the options that are used in our `Ceph FullMesh Guide` and are
probably the most used ones.
- HelloInterval: Time interval in seconds (range 1-600) between
consecutive Hello packets sent on an interface to establish and
maintain adjacency between OpenFabric neighbors.
- CsnpInterval: Time interval in seconds (range 1-600) between
Complete Sequence Number Packets used to synchronize link-state
databases between OpenFabric neighbors.
- HelloMultiplier: Factor (range 2-100) applied to HelloInterval to
determine how long to wait before declaring a neighbor down when no
Hello packets are received.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-network-types/src/hostname.rs | 34 ++++++++++
proxmox-network-types/src/lib.rs | 2 +
proxmox-network-types/src/openfabric.rs | 89 +++++++++++++++++++++++++
3 files changed, 125 insertions(+)
create mode 100644 proxmox-network-types/src/hostname.rs
create mode 100644 proxmox-network-types/src/openfabric.rs
diff --git a/proxmox-network-types/src/hostname.rs b/proxmox-network-types/src/hostname.rs
new file mode 100644
index 000000000000..35ada64e8194
--- /dev/null
+++ b/proxmox-network-types/src/hostname.rs
@@ -0,0 +1,34 @@
+use std::fmt::Display;
+
+use serde::{Deserialize, Serialize};
+
+/// Hostname of pve node.
+///
+/// This is used to distinguish different pve nodes in a fabric.
+#[derive(Debug, Deserialize, Serialize, Clone, Eq, Hash, PartialOrd, Ord, PartialEq)]
+#[serde(from = "String")]
+pub struct Hostname(String);
+
+impl From<String> for Hostname {
+ fn from(value: String) -> Self {
+ Hostname::new(value)
+ }
+}
+
+impl AsRef<str> for Hostname {
+ fn as_ref(&self) -> &str {
+ &self.0
+ }
+}
+
+impl Display for Hostname {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+impl Hostname {
+ pub fn new(name: impl Into<String>) -> Hostname {
+ Self(name.into())
+ }
+}
diff --git a/proxmox-network-types/src/lib.rs b/proxmox-network-types/src/lib.rs
index e69de29bb2d1..afceab018312 100644
--- a/proxmox-network-types/src/lib.rs
+++ b/proxmox-network-types/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod hostname;
+pub mod openfabric;
diff --git a/proxmox-network-types/src/openfabric.rs b/proxmox-network-types/src/openfabric.rs
new file mode 100644
index 000000000000..f3fce5dcca7c
--- /dev/null
+++ b/proxmox-network-types/src/openfabric.rs
@@ -0,0 +1,89 @@
+use std::{fmt::Display, num::ParseIntError};
+
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum IntegerRangeError {
+ #[error("The value must be between {min} and {max} seconds")]
+ OutOfRange { min: i32, max: i32 },
+ #[error("Error parsing to number")]
+ ParsingError(#[from] ParseIntError),
+}
+
+/// The OpenFabric CSNP Interval.
+///
+/// The Complete Sequence Number Packets (CSNP) interval in seconds. The interval range is 1 to
+/// 600.
+#[derive(Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(try_from = "u16")]
+pub struct CsnpInterval(u16);
+
+impl TryFrom<u16> for CsnpInterval {
+ type Error = IntegerRangeError;
+
+ fn try_from(number: u16) -> Result<Self, Self::Error> {
+ if (1..=600).contains(&number) {
+ Ok(CsnpInterval(number))
+ } else {
+ Err(IntegerRangeError::OutOfRange { min: 1, max: 600 })
+ }
+ }
+}
+
+impl Display for CsnpInterval {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+/// The OpenFabric Hello Interval.
+///
+/// The Hello Interval for a given interface in seconds. The range is 1 to 600. Hello packets are
+/// used to establish and maintain adjacency between OpenFabric neighbors.
+#[derive(Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(try_from = "u16")]
+pub struct HelloInterval(u16);
+
+impl TryFrom<u16> for HelloInterval {
+ type Error = IntegerRangeError;
+
+ fn try_from(number: u16) -> Result<Self, Self::Error> {
+ if (1..=600).contains(&number) {
+ Ok(HelloInterval(number))
+ } else {
+ Err(IntegerRangeError::OutOfRange { min: 1, max: 600 })
+ }
+ }
+}
+
+impl Display for HelloInterval {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+/// The OpenFabric Hello Multiplier.
+///
+/// This is the multiplier for the hello holding time on a given interface. The range is 2 to 100.
+#[derive(Serialize, Deserialize, Hash, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[serde(try_from = "u16")]
+pub struct HelloMultiplier(u16);
+
+impl TryFrom<u16> for HelloMultiplier {
+ type Error = IntegerRangeError;
+
+ fn try_from(number: u16) -> Result<Self, Self::Error> {
+ if (2..=100).contains(&number) {
+ Ok(HelloMultiplier(number))
+ } else {
+ Err(IntegerRangeError::OutOfRange { min: 2, max: 100 })
+ }
+ }
+}
+
+impl Display for HelloMultiplier {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 03/17] network-types: add openfabric NET type
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (2 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 02/17] network-types: add common hostname and openfabric types Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 04/17] network-types: move Ipv4Cidr and Ipv6Cidr types Gabriel Goller
` (49 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
The Network Entity Title is currently only used in openfabric, but it's
a generic construct, which in the future, will also be used in IS-IS
(when it's ported in rust).
Also include helpers that convert from IPv4 and IPv6 to NET by using the
Binary Coded Decimals (BCD). The IPv4 conversion is quite
straightforward, you just pad up the numbers and then split the address
in 3 quartets which is your SystemId. On IPv6 you take the last 3
segments, which can be directly converted into the NET address.
The NET is defined in a ISO standard and also briefly explained here:
https://datatracker.ietf.org/doc/html/rfc1142#section-7.1.1
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-network-types/src/lib.rs | 1 +
proxmox-network-types/src/net.rs | 382 +++++++++++++++++++++++++++++++
2 files changed, 383 insertions(+)
create mode 100644 proxmox-network-types/src/net.rs
diff --git a/proxmox-network-types/src/lib.rs b/proxmox-network-types/src/lib.rs
index afceab018312..797084fec423 100644
--- a/proxmox-network-types/src/lib.rs
+++ b/proxmox-network-types/src/lib.rs
@@ -1,2 +1,3 @@
pub mod hostname;
+pub mod net;
pub mod openfabric;
diff --git a/proxmox-network-types/src/net.rs b/proxmox-network-types/src/net.rs
new file mode 100644
index 000000000000..97e019383bcc
--- /dev/null
+++ b/proxmox-network-types/src/net.rs
@@ -0,0 +1,382 @@
+use std::{
+ fmt::Display,
+ net::{IpAddr, Ipv4Addr, Ipv6Addr},
+ str::FromStr,
+};
+
+use serde::Serialize;
+use serde_with::{DeserializeFromStr, SerializeDisplay};
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum NetError {
+ #[error("Some octets are missing")]
+ WrongLength,
+ #[error("The NET selector must be two characters wide and be 00")]
+ InvalidNetSelector,
+ #[error("Invalid AFI (wrong size or position)")]
+ InvalidAFI,
+ #[error("Invalid Area (wrong size or position)")]
+ InvalidArea,
+ #[error("Invalid SystemId (wrong size or position)")]
+ InvalidSystemId,
+}
+
+/// Address Family authority Identifier - 49 The AFI value 49 is what IS-IS (and openfabric) uses
+/// for private addressing.
+#[derive(
+ Debug, DeserializeFromStr, SerializeDisplay, Clone, Hash, PartialEq, Eq, PartialOrd, Ord,
+)]
+struct NetAFI(String);
+
+impl Default for NetAFI {
+ fn default() -> Self {
+ Self("49".to_owned())
+ }
+}
+
+impl Display for NetAFI {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
+impl FromStr for NetAFI {
+ type Err = NetError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if s.len() != 2 {
+ Err(NetError::InvalidAFI)
+ } else {
+ Ok(Self(s.to_owned()))
+ }
+ }
+}
+
+/// Area identifier: 0001 IS-IS area number (numerical area 1)
+/// The second part (system) of the `net` identifier. Every node has to have a different system
+/// number.
+#[derive(Debug, DeserializeFromStr, Serialize, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+struct NetArea(String);
+
+impl Default for NetArea {
+ fn default() -> Self {
+ Self("0001".to_owned())
+ }
+}
+
+impl Display for NetArea {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
+impl FromStr for NetArea {
+ type Err = NetError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if s.len() != 4 {
+ Err(NetError::InvalidArea)
+ } else {
+ Ok(Self(s.to_owned()))
+ }
+ }
+}
+
+/// System identifier: 1921.6800.1002 - for system identifiers we recommend to use IP address or
+/// MAC address of the router itself. The way to construct this is to keep all of the zeroes of the
+/// router IP address, and then change the periods from being every three numbers to every four
+/// numbers. The address that is listed here is 192.168.1.2, which if expanded will turn into
+/// 192.168.001.002. Then all one has to do is move the dots to have four numbers instead of three.
+/// This gives us 1921.6800.1002.
+#[derive(Debug, DeserializeFromStr, Serialize, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+struct NetSystemId(String);
+
+impl Display for NetSystemId {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
+impl FromStr for NetSystemId {
+ type Err = NetError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if s.split(".").count() != 3
+ || s.split(".").any(|segment| {
+ segment.len() != 4 || !segment.chars().all(|c| c.is_ascii_hexdigit())
+ })
+ {
+ Err(NetError::InvalidSystemId)
+ } else {
+ Ok(Self(s.to_owned()))
+ }
+ }
+}
+
+/// Convert IP-Address to a NET address with the default afi, area and selector values. Note that a
+/// valid Ipv4Addr is always a valid SystemId as well.
+impl From<Ipv4Addr> for NetSystemId {
+ fn from(value: Ipv4Addr) -> Self {
+ let octets = value.octets();
+
+ let system_id_str = format!(
+ "{:03}{:01}.{:02}{:02}.{:01}{:03}",
+ octets[0],
+ octets[1] / 100,
+ octets[1] % 100,
+ octets[2] / 10,
+ octets[2] % 10,
+ octets[3]
+ );
+
+ Self(system_id_str)
+ }
+}
+
+/// Convert IPv6-Address to a NET address with the default afi, area and selector values. Note that a
+/// valid Ipv6Addr is always a valid SystemId as well.
+impl From<Ipv6Addr> for NetSystemId {
+ fn from(value: Ipv6Addr) -> Self {
+ let segments = value.segments();
+ //
+ // Use the last 3 segments (out of 8) of the IPv6 address
+ let system_id_str = format!(
+ "{:04x}.{:04x}.{:04x}",
+ segments[5], segments[6], segments[7]
+ );
+
+ Self(system_id_str)
+ }
+}
+
+/// NET selector: 00 Must always be 00. This setting indicates “this system” or “local system.”
+#[derive(Debug, DeserializeFromStr, Serialize, Clone, Hash, PartialEq, Eq, PartialOrd, Ord)]
+struct NetSelector(String);
+
+impl Default for NetSelector {
+ fn default() -> Self {
+ Self("00".to_owned())
+ }
+}
+
+impl Display for NetSelector {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}", self.0)
+ }
+}
+
+impl FromStr for NetSelector {
+ type Err = NetError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if s.len() != 2 {
+ Err(NetError::InvalidNetSelector)
+ } else {
+ Ok(Self(s.to_owned()))
+ }
+ }
+}
+
+/// The OpenFabric Net.
+///
+/// Every OpenFabric node and fabric is identified through the NET. It has a network and a host
+/// part.
+/// The first part is the network part (also called area). The entire OpenFabric fabric has to have
+/// the same network part (area). The first number is the [`NetAFI`] and the second is the [`NetArea`].
+/// e.g.: "49.0001"
+/// The second part is the host part, which has to differ on every node in the fabric. It contains
+/// the [`NetSystemId`] and the [`NetSelector`].
+/// e.g.: "1921.6800.1002.00"
+#[derive(
+ Debug, DeserializeFromStr, SerializeDisplay, Clone, Hash, PartialEq, Eq, PartialOrd, Ord,
+)]
+pub struct Net {
+ afi: NetAFI,
+ area: NetArea,
+ system: NetSystemId,
+ selector: NetSelector,
+}
+
+impl FromStr for Net {
+ type Err = NetError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if s.split(".").count() != 6 {
+ return Err(NetError::WrongLength);
+ }
+ let mut iter = s.split(".");
+ let afi = iter.next().ok_or(NetError::WrongLength)?;
+ let area = iter.next().ok_or(NetError::WrongLength)?;
+ let system = format!(
+ "{}.{}.{}",
+ iter.next().ok_or(NetError::WrongLength)?,
+ iter.next().ok_or(NetError::WrongLength)?,
+ iter.next().ok_or(NetError::WrongLength)?
+ );
+ let selector = iter.next().ok_or(NetError::WrongLength)?;
+ Ok(Self {
+ afi: afi.parse()?,
+ area: area.parse()?,
+ system: system.parse()?,
+ selector: selector.parse()?,
+ })
+ }
+}
+
+/// Default NET address for a given Ipv4Addr. This adds the default afi, area and selector to the
+/// address.
+impl From<Ipv4Addr> for Net {
+ fn from(value: Ipv4Addr) -> Self {
+ Self {
+ afi: NetAFI::default(),
+ area: NetArea::default(),
+ system: value.into(),
+ selector: NetSelector::default(),
+ }
+ }
+}
+
+/// Default NET address for a given Ipv6Addr. This adds the default afi, area and selector to the
+/// address.
+impl From<Ipv6Addr> for Net {
+ fn from(value: Ipv6Addr) -> Self {
+ Self {
+ afi: NetAFI::default(),
+ area: NetArea::default(),
+ system: value.into(),
+ selector: NetSelector::default(),
+ }
+ }
+}
+
+/// Default NET address for a given IpAddr (can be either Ipv4 or Ipv6). This adds the default afi,
+/// area and selector to the address.
+impl From<IpAddr> for Net {
+ fn from(value: IpAddr) -> Self {
+ Self {
+ afi: NetAFI::default(),
+ area: NetArea::default(),
+ system: match value {
+ IpAddr::V4(ipv4_addr) => ipv4_addr.into(),
+ IpAddr::V6(ipv6_addr) => ipv6_addr.into(),
+ },
+ selector: NetSelector::default(),
+ }
+ }
+}
+
+impl Display for Net {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(
+ f,
+ "{}.{}.{}.{}",
+ self.afi, self.area, self.system, self.selector
+ )
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use super::*;
+
+ #[test]
+ fn test_net_from_str() {
+ let input = "49.0001.1921.6800.1002.00";
+ let net = input.parse::<Net>().expect("this net should parse");
+ assert_eq!(net.afi, NetAFI("49".to_owned()));
+ assert_eq!(net.area, NetArea("0001".to_owned()));
+ assert_eq!(net.system, NetSystemId("1921.6800.1002".to_owned()));
+ assert_eq!(net.selector, NetSelector("00".to_owned()));
+
+ let input = "45.0200.0100.1001.ba1f.01";
+ let net = input.parse::<Net>().expect("this net should parse");
+ assert_eq!(net.afi, NetAFI("45".to_owned()));
+ assert_eq!(net.area, NetArea("0200".to_owned()));
+ assert_eq!(net.system, NetSystemId("0100.1001.ba1f".to_owned()));
+ assert_eq!(net.selector, NetSelector("01".to_owned()));
+ }
+
+ #[test]
+ fn test_net_from_str_failed() {
+ let input = "49.0001.1921.6800.1002.000";
+ assert!(matches!(
+ input.parse::<Net>(),
+ Err(NetError::InvalidNetSelector)
+ ));
+
+ let input = "49.0001.1921.6800.1002.00.00";
+ assert!(matches!(input.parse::<Net>(), Err(NetError::WrongLength)));
+
+ let input = "49.0001.1921.6800.10002.00";
+ assert!(matches!(
+ input.parse::<Net>(),
+ Err(NetError::InvalidSystemId)
+ ));
+
+ let input = "49.0001.1921.6800.1z02.00";
+ assert!(matches!(
+ input.parse::<Net>(),
+ Err(NetError::InvalidSystemId)
+ ));
+
+ let input = "409.0001.1921.6800.1002.00";
+ assert!(matches!(input.parse::<Net>(), Err(NetError::InvalidAFI)));
+
+ let input = "49.00001.1921.6800.1002.00";
+ assert!(matches!(input.parse::<Net>(), Err(NetError::InvalidArea)));
+ }
+
+ #[test]
+ fn test_net_display() {
+ let net = Net {
+ afi: NetAFI("49".to_owned()),
+ area: NetArea("0001".to_owned()),
+ system: NetSystemId("1921.6800.1002".to_owned()),
+ selector: NetSelector("00".to_owned()),
+ };
+ assert_eq!(format!("{net}"), "49.0001.1921.6800.1002.00");
+ }
+
+ #[test]
+ fn test_net_from_ipv4() {
+ let ip: Ipv4Addr = "192.168.1.100".parse().unwrap();
+ let net: Net = ip.into();
+ assert_eq!(format!("{net}"), "49.0001.1921.6800.1100.00");
+
+ let ip1: Ipv4Addr = "10.10.2.245".parse().unwrap();
+ let net1: Net = ip1.into();
+ assert_eq!(format!("{net1}"), "49.0001.0100.1000.2245.00");
+
+ let ip2: Ipv4Addr = "1.1.1.1".parse().unwrap();
+ let net2: Net = ip2.into();
+ assert_eq!(format!("{net2}"), "49.0001.0010.0100.1001.00");
+ }
+
+ #[test]
+ fn test_net_from_ipv6() {
+ // 2001:db8::1 -> [2001, 0db8, 0, 0, 0, 0, 0, 1]
+ // last 3 segments: [0, 0, 1]
+ let ip: Ipv6Addr = "2001:db8::1".parse().unwrap();
+ let net: Net = ip.into();
+ assert_eq!(format!("{net}"), "49.0001.0000.0000.0001.00");
+
+ // fe80::1234:5678:abcd -> [fe80, 0, 0, 0, 0, 1234, 5678, abcd]
+ // last 3 segments: [1234, 5678, abcd]
+ let ip1: Ipv6Addr = "fe80::1234:5678:abcd".parse().unwrap();
+ let net1: Net = ip1.into();
+ assert_eq!(format!("{net1}"), "49.0001.1234.5678.abcd.00");
+
+ // 2001:0db8:85a3::8a2e:370:7334 -> [2001, 0db8, 85a3, 0, 0, 8a2e, 0370, 7334]
+ // last 3 segments: [8a2e, 0370, 7334]
+ let ip2: Ipv6Addr = "2001:0db8:85a3::8a2e:370:7334".parse().unwrap();
+ let net2: Net = ip2.into();
+ assert_eq!(format!("{net2}"), "49.0001.8a2e.0370.7334.00");
+
+ // ::1 -> [0, 0, 0, 0, 0, 0, 0, 1]
+ // last 3 segments: [0, 0, 1]
+ let ip3: Ipv6Addr = "::1".parse().unwrap();
+ let net3: Net = ip3.into();
+ assert_eq!(format!("{net3}"), "49.0001.0000.0000.0001.00");
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 04/17] network-types: move Ipv4Cidr and Ipv6Cidr types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (3 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 03/17] network-types: add openfabric NET type Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 05/17] frr: create proxmox-frr crate Gabriel Goller
` (48 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Move the Ipv4Cidr and Ipv6Cidr types (and co.) from
proxmox-ve-config firewall module to the proxmox-network-types crate.
They are also used in the fabrics module, so to avoid importing from
the firewall module, move them here.
We also have to update the proxmox-firewall crate, which is done in a
following patch.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.../src}/address.rs | 14 +++++-----
proxmox-network-types/src/lib.rs | 1 +
proxmox-ve-config/Cargo.toml | 1 +
proxmox-ve-config/src/firewall/cluster.rs | 3 +--
proxmox-ve-config/src/firewall/ct_helper.rs | 8 +++---
proxmox-ve-config/src/firewall/host.rs | 3 ++-
proxmox-ve-config/src/firewall/types/alias.rs | 3 ++-
proxmox-ve-config/src/firewall/types/ipset.rs | 26 ++++++++++++++++---
proxmox-ve-config/src/firewall/types/mod.rs | 2 --
proxmox-ve-config/src/firewall/types/rule.rs | 3 +--
.../src/firewall/types/rule_match.rs | 5 ++--
proxmox-ve-config/src/guest/vm.rs | 4 ++-
proxmox-ve-config/src/host/utils.rs | 2 +-
proxmox-ve-config/src/sdn/config.rs | 8 +++---
proxmox-ve-config/src/sdn/ipam.rs | 4 ++-
proxmox-ve-config/src/sdn/mod.rs | 2 +-
proxmox-ve-config/tests/sdn/main.rs | 3 ++-
17 files changed, 61 insertions(+), 31 deletions(-)
rename {proxmox-ve-config/src/firewall/types => proxmox-network-types/src}/address.rs (99%)
diff --git a/proxmox-ve-config/src/firewall/types/address.rs b/proxmox-network-types/src/address.rs
similarity index 99%
rename from proxmox-ve-config/src/firewall/types/address.rs
rename to proxmox-network-types/src/address.rs
index 9b73d3d79d4e..218e2e21105e 100644
--- a/proxmox-ve-config/src/firewall/types/address.rs
+++ b/proxmox-network-types/src/address.rs
@@ -119,7 +119,9 @@ impl From<IpAddr> for Cidr {
const IPV4_LENGTH: u8 = 32;
-#[derive(Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
+#[derive(
+ SerializeDisplay, DeserializeFromStr, Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash,
+)]
pub struct Ipv4Cidr {
addr: Ipv4Addr,
mask: u8,
@@ -193,7 +195,9 @@ impl fmt::Display for Ipv4Cidr {
const IPV6_LENGTH: u8 = 128;
-#[derive(Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash)]
+#[derive(
+ SerializeDisplay, DeserializeFromStr, Clone, Copy, Debug, PartialOrd, Ord, PartialEq, Eq, Hash,
+)]
pub struct Ipv6Cidr {
addr: Ipv6Addr,
mask: u8,
@@ -596,8 +600,7 @@ impl<T: fmt::Display> fmt::Display for AddressRange<T> {
}
}
-#[derive(Clone, Debug)]
-#[cfg_attr(test, derive(Eq, PartialEq))]
+#[derive(Clone, Debug, PartialEq, Eq)]
pub enum IpEntry {
Cidr(Cidr),
Range(IpRange),
@@ -649,8 +652,7 @@ impl From<IpRange> for IpEntry {
}
}
-#[derive(Clone, Debug, DeserializeFromStr)]
-#[cfg_attr(test, derive(Eq, PartialEq))]
+#[derive(Clone, Debug, DeserializeFromStr, PartialEq, Eq)]
pub struct IpList {
// guaranteed to have the same family
entries: Vec<IpEntry>,
diff --git a/proxmox-network-types/src/lib.rs b/proxmox-network-types/src/lib.rs
index 797084fec423..53079b2712a7 100644
--- a/proxmox-network-types/src/lib.rs
+++ b/proxmox-network-types/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod address;
pub mod hostname;
pub mod net;
pub mod openfabric;
diff --git a/proxmox-ve-config/Cargo.toml b/proxmox-ve-config/Cargo.toml
index b20ced177265..4906d77550f3 100644
--- a/proxmox-ve-config/Cargo.toml
+++ b/proxmox-ve-config/Cargo.toml
@@ -20,3 +20,4 @@ serde_with = "3"
proxmox-schema = "4"
proxmox-sys = "0.6.4"
proxmox-sortable-macro = "0.1.3"
+proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
diff --git a/proxmox-ve-config/src/firewall/cluster.rs b/proxmox-ve-config/src/firewall/cluster.rs
index ce3dd53446f8..b4e5271c4497 100644
--- a/proxmox-ve-config/src/firewall/cluster.rs
+++ b/proxmox-ve-config/src/firewall/cluster.rs
@@ -135,7 +135,6 @@ pub struct Options {
#[cfg(test)]
mod tests {
use crate::firewall::types::{
- address::IpList,
alias::{AliasName, AliasScope},
ipset::{IpsetAddress, IpsetEntry},
log::{LogLevel, LogRateLimitTimescale},
@@ -143,8 +142,8 @@ mod tests {
rule_match::{
Icmpv6, Icmpv6Code, IpAddrMatch, IpMatch, Ports, Protocol, RuleMatch, Tcp, Udp,
},
- Cidr,
};
+ use proxmox_network_types::address::{Cidr, IpList};
use super::*;
diff --git a/proxmox-ve-config/src/firewall/ct_helper.rs b/proxmox-ve-config/src/firewall/ct_helper.rs
index 40e4feef5b12..f4c5ba8cef3b 100644
--- a/proxmox-ve-config/src/firewall/ct_helper.rs
+++ b/proxmox-ve-config/src/firewall/ct_helper.rs
@@ -1,9 +1,11 @@
-use anyhow::{bail, Error};
-use serde::Deserialize;
use std::collections::HashMap;
use std::sync::OnceLock;
-use crate::firewall::types::address::Family;
+use anyhow::{bail, Error};
+use serde::Deserialize;
+
+use proxmox_network_types::address::Family;
+
use crate::firewall::types::rule_match::{Ports, Protocol, Tcp, Udp};
#[derive(Clone, Debug, Deserialize)]
diff --git a/proxmox-ve-config/src/firewall/host.rs b/proxmox-ve-config/src/firewall/host.rs
index 394896c48221..31ced4c3edbe 100644
--- a/proxmox-ve-config/src/firewall/host.rs
+++ b/proxmox-ve-config/src/firewall/host.rs
@@ -5,12 +5,13 @@ use anyhow::{bail, Error};
use serde::Deserialize;
use crate::host::utils::{host_ips, network_interface_cidrs};
+use proxmox_network_types::address::Cidr;
use proxmox_sys::nodename;
use crate::firewall::parse;
use crate::firewall::types::log::LogLevel;
use crate::firewall::types::rule::Direction;
-use crate::firewall::types::{Alias, Cidr, Rule};
+use crate::firewall::types::{Alias, Rule};
/// default setting for the enabled key
pub const HOST_ENABLED_DEFAULT: bool = true;
diff --git a/proxmox-ve-config/src/firewall/types/alias.rs b/proxmox-ve-config/src/firewall/types/alias.rs
index 7bc2fb8395db..2fa2658e413a 100644
--- a/proxmox-ve-config/src/firewall/types/alias.rs
+++ b/proxmox-ve-config/src/firewall/types/alias.rs
@@ -4,8 +4,9 @@ use std::str::FromStr;
use anyhow::{bail, format_err, Error};
use serde_with::{DeserializeFromStr, SerializeDisplay};
+use proxmox_network_types::address::Cidr;
+
use crate::firewall::parse::{match_name, match_non_whitespace};
-use crate::firewall::types::address::Cidr;
#[derive(Debug, Clone)]
#[cfg_attr(test, derive(Eq, PartialEq))]
diff --git a/proxmox-ve-config/src/firewall/types/ipset.rs b/proxmox-ve-config/src/firewall/types/ipset.rs
index fe5a930f2352..c048e3f82c32 100644
--- a/proxmox-ve-config/src/firewall/types/ipset.rs
+++ b/proxmox-ve-config/src/firewall/types/ipset.rs
@@ -1,12 +1,14 @@
use core::fmt::Display;
+use std::net::IpAddr;
use std::ops::{Deref, DerefMut};
use std::str::FromStr;
use anyhow::{bail, format_err, Error};
use serde_with::DeserializeFromStr;
+use proxmox_network_types::address::{Cidr, IpRange, Ipv4Cidr, Ipv6Cidr};
+
use crate::firewall::parse::match_non_whitespace;
-use crate::firewall::types::address::{Cidr, IpRange};
use crate::firewall::types::alias::AliasName;
use crate::guest::vm::NetworkConfig;
@@ -112,8 +114,26 @@ impl FromStr for IpsetAddress {
}
}
-impl<T: Into<Cidr>> From<T> for IpsetAddress {
- fn from(cidr: T) -> Self {
+impl From<Ipv4Cidr> for IpsetAddress {
+ fn from(cidr: Ipv4Cidr) -> Self {
+ IpsetAddress::Cidr(cidr.into())
+ }
+}
+
+impl From<Ipv6Cidr> for IpsetAddress {
+ fn from(cidr: Ipv6Cidr) -> Self {
+ IpsetAddress::Cidr(cidr.into())
+ }
+}
+
+impl From<Cidr> for IpsetAddress {
+ fn from(cidr: Cidr) -> Self {
+ IpsetAddress::Cidr(cidr)
+ }
+}
+
+impl From<IpAddr> for IpsetAddress {
+ fn from(cidr: IpAddr) -> Self {
IpsetAddress::Cidr(cidr.into())
}
}
diff --git a/proxmox-ve-config/src/firewall/types/mod.rs b/proxmox-ve-config/src/firewall/types/mod.rs
index 8fd551e4d226..9633e0b4fc3c 100644
--- a/proxmox-ve-config/src/firewall/types/mod.rs
+++ b/proxmox-ve-config/src/firewall/types/mod.rs
@@ -1,4 +1,3 @@
-pub mod address;
pub mod alias;
pub mod group;
pub mod ipset;
@@ -7,7 +6,6 @@ pub mod port;
pub mod rule;
pub mod rule_match;
-pub use address::Cidr;
pub use alias::Alias;
pub use group::Group;
pub use ipset::Ipset;
diff --git a/proxmox-ve-config/src/firewall/types/rule.rs b/proxmox-ve-config/src/firewall/types/rule.rs
index 2c8f49c27507..192d4ddfa66a 100644
--- a/proxmox-ve-config/src/firewall/types/rule.rs
+++ b/proxmox-ve-config/src/firewall/types/rule.rs
@@ -248,13 +248,12 @@ impl FromStr for RuleGroup {
#[cfg(test)]
mod tests {
use crate::firewall::types::{
- address::{IpEntry, IpList, IpRange},
alias::{AliasName, AliasScope},
ipset::{IpsetName, IpsetScope},
log::LogLevel,
rule_match::{Icmp, IcmpCode, IpAddrMatch, IpMatch, Ports, Protocol, Udp},
- Cidr,
};
+ use proxmox_network_types::address::{Cidr, IpEntry, IpList, IpRange};
use super::*;
diff --git a/proxmox-ve-config/src/firewall/types/rule_match.rs b/proxmox-ve-config/src/firewall/types/rule_match.rs
index 94d862439e18..05a34a7bcd46 100644
--- a/proxmox-ve-config/src/firewall/types/rule_match.rs
+++ b/proxmox-ve-config/src/firewall/types/rule_match.rs
@@ -7,10 +7,10 @@ use serde::Deserialize;
use anyhow::{bail, format_err, Error};
use serde::de::IntoDeserializer;
+use proxmox_network_types::address::{Family, IpList};
use proxmox_sortable_macro::sortable;
use crate::firewall::parse::{match_name, match_non_whitespace, SomeStr};
-use crate::firewall::types::address::{Family, IpList};
use crate::firewall::types::alias::AliasName;
use crate::firewall::types::ipset::IpsetName;
use crate::firewall::types::log::LogLevel;
@@ -770,7 +770,8 @@ impl fmt::Display for Icmpv6Code {
#[cfg(test)]
mod tests {
- use crate::firewall::types::{alias::AliasScope::Guest, Cidr};
+ use crate::firewall::types::alias::AliasScope::Guest;
+ use proxmox_network_types::address::Cidr;
use super::*;
diff --git a/proxmox-ve-config/src/guest/vm.rs b/proxmox-ve-config/src/guest/vm.rs
index 3476b93cabd1..fcb653f51967 100644
--- a/proxmox-ve-config/src/guest/vm.rs
+++ b/proxmox-ve-config/src/guest/vm.rs
@@ -9,7 +9,7 @@ use anyhow::{bail, Error};
use serde_with::DeserializeFromStr;
use crate::firewall::parse::{match_digits, parse_bool};
-use crate::firewall::types::address::{Ipv4Cidr, Ipv6Cidr};
+use proxmox_network_types::address::{Ipv4Cidr, Ipv6Cidr};
#[derive(Clone, Debug, DeserializeFromStr, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub struct MacAddress([u8; 6]);
@@ -266,6 +266,8 @@ impl NetworkConfig {
#[cfg(test)]
mod tests {
+ use proxmox_network_types::address::Ipv4Cidr;
+
use super::*;
#[test]
diff --git a/proxmox-ve-config/src/host/utils.rs b/proxmox-ve-config/src/host/utils.rs
index b1dc8e988b32..270b1af4b5d8 100644
--- a/proxmox-ve-config/src/host/utils.rs
+++ b/proxmox-ve-config/src/host/utils.rs
@@ -1,6 +1,6 @@
use std::net::{IpAddr, ToSocketAddrs};
-use crate::firewall::types::Cidr;
+use proxmox_network_types::address::Cidr;
use nix::sys::socket::{AddressFamily, SockaddrLike};
use proxmox_sys::nodename;
diff --git a/proxmox-ve-config/src/sdn/config.rs b/proxmox-ve-config/src/sdn/config.rs
index 7ee1101e5bb6..a25bb35ae060 100644
--- a/proxmox-ve-config/src/sdn/config.rs
+++ b/proxmox-ve-config/src/sdn/config.rs
@@ -6,17 +6,17 @@ use std::{
str::FromStr,
};
-use proxmox_schema::{property_string::PropertyString, ApiType, ObjectSchema, StringSchema};
-
use serde::Deserialize;
use serde_with::{DeserializeFromStr, SerializeDisplay};
+use proxmox_network_types::address::{Cidr, IpRange, IpRangeError};
+use proxmox_schema::{property_string::PropertyString, ApiType, ObjectSchema, StringSchema};
+
use crate::{
common::Allowlist,
firewall::types::{
- address::{IpRange, IpRangeError},
ipset::{IpsetEntry, IpsetName, IpsetScope},
- Cidr, Ipset,
+ Ipset,
},
sdn::{SdnNameError, SubnetName, VnetName, ZoneName},
};
diff --git a/proxmox-ve-config/src/sdn/ipam.rs b/proxmox-ve-config/src/sdn/ipam.rs
index 598b835c1f72..a73e8abbdcd2 100644
--- a/proxmox-ve-config/src/sdn/ipam.rs
+++ b/proxmox-ve-config/src/sdn/ipam.rs
@@ -7,11 +7,13 @@ use std::{
use serde::Deserialize;
+use proxmox_network_types::address::Cidr;
+
use crate::{
common::Allowlist,
firewall::types::{
ipset::{IpsetEntry, IpsetScope},
- Cidr, Ipset,
+ Ipset,
},
guest::{types::Vmid, vm::MacAddress},
sdn::{SdnNameError, SubnetName, ZoneName},
diff --git a/proxmox-ve-config/src/sdn/mod.rs b/proxmox-ve-config/src/sdn/mod.rs
index c8dc72471693..25ed7e476b9f 100644
--- a/proxmox-ve-config/src/sdn/mod.rs
+++ b/proxmox-ve-config/src/sdn/mod.rs
@@ -5,7 +5,7 @@ use std::{error::Error, fmt::Display, str::FromStr};
use serde_with::DeserializeFromStr;
-use crate::firewall::types::Cidr;
+use proxmox_network_types::address::Cidr;
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
pub enum SdnNameError {
diff --git a/proxmox-ve-config/tests/sdn/main.rs b/proxmox-ve-config/tests/sdn/main.rs
index 1815bec5ff1a..bc71cd536ae0 100644
--- a/proxmox-ve-config/tests/sdn/main.rs
+++ b/proxmox-ve-config/tests/sdn/main.rs
@@ -3,8 +3,9 @@ use std::{
str::FromStr,
};
+use proxmox_network_types::address::{Cidr, IpRange};
+
use proxmox_ve_config::{
- firewall::types::{address::IpRange, Cidr},
guest::vm::MacAddress,
sdn::{
config::{
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 05/17] frr: create proxmox-frr crate
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (4 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 04/17] network-types: move Ipv4Cidr and Ipv6Cidr types Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 06/17] frr: add common frr types Gabriel Goller
` (47 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
This crate holds FRR-types, so rust-types that closely resemble
FRR-configuration items. These types can then simply be converted to
strings (and the final FRR config) by serializing. This has minimal
dependencies and it's only internal dependency is proxmox-network-types,
which holds common types. This way we could reuse proxmox-frr on
different products, without dragging product-specific types with us.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
Cargo.toml | 1 +
proxmox-frr/Cargo.toml | 22 +++++++++++++++
proxmox-frr/debian/changelog | 5 ++++
proxmox-frr/debian/control | 47 ++++++++++++++++++++++++++++++++
proxmox-frr/debian/copyright | 18 ++++++++++++
proxmox-frr/debian/debcargo.toml | 7 +++++
proxmox-frr/src/lib.rs | 0
7 files changed, 100 insertions(+)
create mode 100644 proxmox-frr/Cargo.toml
create mode 100644 proxmox-frr/debian/changelog
create mode 100644 proxmox-frr/debian/control
create mode 100644 proxmox-frr/debian/copyright
create mode 100644 proxmox-frr/debian/debcargo.toml
create mode 100644 proxmox-frr/src/lib.rs
diff --git a/Cargo.toml b/Cargo.toml
index 82f7fe257615..928d7cf4a062 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
[workspace]
members = [
"proxmox-ve-config",
+ "proxmox-frr",
"proxmox-network-types",
]
exclude = [
diff --git a/proxmox-frr/Cargo.toml b/proxmox-frr/Cargo.toml
new file mode 100644
index 000000000000..e40cd1cd37ec
--- /dev/null
+++ b/proxmox-frr/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "proxmox-frr"
+description = "Rust types for the FRR configuration file"
+version = "0.1.0"
+authors.workspace = true
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+exclude.workspace = true
+rust-version.workspace = true
+
+[dependencies]
+thiserror = { workspace = true }
+anyhow = "1"
+tracing = "0.1"
+
+serde = { workspace = true, features = [ "derive" ] }
+serde_with = { workspace = true }
+itoa = "1.0.9"
+
+proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
+
diff --git a/proxmox-frr/debian/changelog b/proxmox-frr/debian/changelog
new file mode 100644
index 000000000000..5cfba8538fe4
--- /dev/null
+++ b/proxmox-frr/debian/changelog
@@ -0,0 +1,5 @@
+rust-proxmox-frr (0.1.0) unstable; urgency=medium
+
+ * Initial release.
+
+ -- Proxmox Support Team <support@proxmox.com> Mon, 03 Jun 2024 10:51:11 +0200
diff --git a/proxmox-frr/debian/control b/proxmox-frr/debian/control
new file mode 100644
index 000000000000..cde6b788cadf
--- /dev/null
+++ b/proxmox-frr/debian/control
@@ -0,0 +1,47 @@
+Source: rust-proxmox-frr
+Section: rust
+Priority: optional
+Build-Depends: debhelper-compat (= 13),
+ dh-sequence-cargo
+Build-Depends-Arch: cargo:native <!nocheck>,
+ rustc:native (>= 1.82) <!nocheck>,
+ libstd-rust-dev <!nocheck>,
+ librust-anyhow-1+default-dev <!nocheck>,
+ librust-itoa-1+default-dev (>= 1.0.9-~~) <!nocheck>,
+ librust-proxmox-network-types-0.1+default-dev <!nocheck>,
+ librust-serde-1+default-dev <!nocheck>,
+ librust-serde-1+derive-dev <!nocheck>,
+ librust-serde-with-3+default-dev (>= 3.8.1-~~) <!nocheck>,
+ librust-thiserror-2+default-dev <!nocheck>,
+ librust-tracing-0.1+default-dev <!nocheck>
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Standards-Version: 4.7.0
+Vcs-Git: git://git.proxmox.com/git/proxmox-ve-rs.git
+Vcs-Browser: https://git.proxmox.com/?p=proxmox-ve-rs.git
+Homepage: https://proxmox.com
+X-Cargo-Crate: proxmox-frr
+Rules-Requires-Root: no
+
+Package: librust-proxmox-frr-dev
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ librust-anyhow-1+default-dev,
+ librust-itoa-1+default-dev (>= 1.0.9-~~),
+ librust-proxmox-network-types-0.1+default-dev,
+ librust-serde-1+default-dev,
+ librust-serde-1+derive-dev,
+ librust-serde-with-3+default-dev (>= 3.8.1-~~),
+ librust-thiserror-2+default-dev,
+ librust-tracing-0.1+default-dev
+Provides:
+ librust-proxmox-frr+default-dev (= ${binary:Version}),
+ librust-proxmox-frr-0-dev (= ${binary:Version}),
+ librust-proxmox-frr-0+default-dev (= ${binary:Version}),
+ librust-proxmox-frr-0.1-dev (= ${binary:Version}),
+ librust-proxmox-frr-0.1+default-dev (= ${binary:Version}),
+ librust-proxmox-frr-0.1.0-dev (= ${binary:Version}),
+ librust-proxmox-frr-0.1.0+default-dev (= ${binary:Version})
+Description: Rust types for the FRR configuration file - Rust source code
+ Source code for Debianized Rust crate "proxmox-frr"
diff --git a/proxmox-frr/debian/copyright b/proxmox-frr/debian/copyright
new file mode 100644
index 000000000000..1ea8a56b4f58
--- /dev/null
+++ b/proxmox-frr/debian/copyright
@@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+
+Files:
+ *
+Copyright: 2019 - 2025 Proxmox Server Solutions GmbH <support@proxmox.com>
+License: AGPL-3.0-or-later
+ This program is free software: you can redistribute it and/or modify it under
+ the terms of the GNU Affero General Public License as published by the Free
+ Software Foundation, either version 3 of the License, or (at your option) any
+ later version.
+ .
+ This program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU Affero General Public License along
+ with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/proxmox-frr/debian/debcargo.toml b/proxmox-frr/debian/debcargo.toml
new file mode 100644
index 000000000000..87a787e6d03e
--- /dev/null
+++ b/proxmox-frr/debian/debcargo.toml
@@ -0,0 +1,7 @@
+overlay = "."
+crate_src_path = ".."
+maintainer = "Proxmox Support Team <support@proxmox.com>"
+
+[source]
+vcs_git = "git://git.proxmox.com/git/proxmox-ve-rs.git"
+vcs_browser = "https://git.proxmox.com/?p=proxmox-ve-rs.git"
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
new file mode 100644
index 000000000000..e69de29bb2d1
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 06/17] frr: add common frr types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (5 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 05/17] frr: create proxmox-frr crate Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 07/17] frr: add openfabric types Gabriel Goller
` (46 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Add common frr types such as FrrWord, CommonInterfaceName, etc. These
are some commong types that are used by both openfabric and ospf and the
generic types that span the two protocols.
The FrrWord is a simple primitive in FRR, which is a ascii-string that
doesn't contain whitespaces.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/src/lib.rs | 114 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 114 insertions(+)
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
index e69de29bb2d1..926ca42917a9 100644
--- a/proxmox-frr/src/lib.rs
+++ b/proxmox-frr/src/lib.rs
@@ -0,0 +1,114 @@
+use std::{collections::BTreeMap, fmt::Display, str::FromStr};
+
+use serde::{Deserialize, Serialize};
+use serde_with::{DeserializeFromStr, SerializeDisplay};
+use thiserror::Error;
+
+#[derive(Error, Debug)]
+pub enum RouterNameError {
+ #[error("invalid name")]
+ InvalidName,
+ #[error("invalid frr word")]
+ FrrWordError(#[from] FrrWordError),
+}
+
+/// The interface name is the same on ospf and openfabric, but it is an enum so we can have two
+/// different entries in the hashmap. This allows us to have an interface in an ospf and openfabric
+/// fabric.
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Hash, PartialOrd, Ord)]
+pub enum InterfaceName {
+ OpenFabric(CommonInterfaceName),
+ Ospf(CommonInterfaceName),
+}
+
+impl Display for InterfaceName {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ InterfaceName::OpenFabric(frr_word) => frr_word.fmt(f),
+ InterfaceName::Ospf(frr_word) => frr_word.fmt(f),
+ }
+ }
+}
+
+#[derive(Error, Debug)]
+pub enum FrrWordError {
+ #[error("word is empty")]
+ IsEmpty,
+ #[error("word contains invalid character")]
+ InvalidCharacter,
+}
+
+/// A simple FRR Word.
+///
+/// Every argument to an FRR option must only contain ascii characters and must not be a
+/// whitespace.
+#[derive(
+ Clone, Debug, PartialEq, Eq, Hash, DeserializeFromStr, SerializeDisplay, PartialOrd, Ord,
+)]
+pub struct FrrWord(String);
+
+impl FrrWord {
+ pub fn new(name: String) -> Result<Self, FrrWordError> {
+ if name.is_empty() {
+ return Err(FrrWordError::IsEmpty);
+ }
+
+ if name
+ .as_bytes()
+ .iter()
+ .any(|c| !c.is_ascii() || c.is_ascii_whitespace())
+ {
+ return Err(FrrWordError::InvalidCharacter);
+ }
+
+ Ok(Self(name))
+ }
+}
+
+impl FromStr for FrrWord {
+ type Err = FrrWordError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ FrrWord::new(s.to_string())
+ }
+}
+
+impl Display for FrrWord {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+impl AsRef<str> for FrrWord {
+ fn as_ref(&self) -> &str {
+ &self.0
+ }
+}
+
+#[derive(Error, Debug)]
+pub enum CommonInterfaceNameError {
+ #[error("interface name too long")]
+ TooLong,
+}
+
+/// Normal linux interface name. 16-bytes length enforced.
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, Hash, PartialOrd, Ord)]
+pub struct CommonInterfaceName(String);
+
+impl FromStr for CommonInterfaceName {
+ type Err = CommonInterfaceNameError;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if s.len() <= 15 {
+ Ok(Self(s.to_owned()))
+ } else {
+ Err(CommonInterfaceNameError::TooLong)
+ }
+ }
+}
+
+impl Display for CommonInterfaceName {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 07/17] frr: add openfabric types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (6 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 06/17] frr: add common frr types Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 08/17] frr: add ospf types Gabriel Goller
` (45 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Implement OpenFabric-specific variants of common enums that encapsulate
protocol properties defined in proxmox-network-types. The primary addition
is OpenFabricInterface, which stores protocol-specific timing parameters:
HelloInterval (neighbor discovery frequency), CsnpInterval (database
synchronization frequency), and HelloMultiplier (neighbor failure detection).
Added `is_ipv6` flag to support FRR's command prefixing requirements during
serialization for IPv6-specific commands (we need to add a 'ipv6' prefix
to some commands).
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/src/lib.rs | 1 +
proxmox-frr/src/openfabric.rs | 93 +++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+)
create mode 100644 proxmox-frr/src/openfabric.rs
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
index 926ca42917a9..d54f83127501 100644
--- a/proxmox-frr/src/lib.rs
+++ b/proxmox-frr/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod openfabric;
use std::{collections::BTreeMap, fmt::Display, str::FromStr};
use serde::{Deserialize, Serialize};
diff --git a/proxmox-frr/src/openfabric.rs b/proxmox-frr/src/openfabric.rs
new file mode 100644
index 000000000000..f814a82af006
--- /dev/null
+++ b/proxmox-frr/src/openfabric.rs
@@ -0,0 +1,93 @@
+use std::fmt::Debug;
+use std::fmt::Display;
+
+use proxmox_network_types::net::Net;
+use serde::{Deserialize, Serialize};
+use serde_with::SerializeDisplay;
+
+use thiserror::Error;
+
+use crate::FrrWord;
+use crate::FrrWordError;
+use crate::RouterNameError;
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, SerializeDisplay, PartialOrd, Ord)]
+pub struct OpenFabricRouterName(FrrWord);
+
+impl From<FrrWord> for OpenFabricRouterName {
+ fn from(value: FrrWord) -> Self {
+ Self(value)
+ }
+}
+
+impl OpenFabricRouterName {
+ pub fn new(name: FrrWord) -> Self {
+ Self(name)
+ }
+}
+
+impl Display for OpenFabricRouterName {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "openfabric {}", self.0)
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub struct OpenFabricRouter {
+ pub net: Net,
+}
+
+impl OpenFabricRouter {
+ pub fn new(net: Net) -> Self {
+ Self { net }
+ }
+
+ pub fn net(&self) -> &Net {
+ &self.net
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub struct OpenFabricInterface {
+ // Note: an interface can only be a part of a single fabric (so no vec needed here)
+ pub fabric_id: OpenFabricRouterName,
+ pub passive: Option<bool>,
+ pub hello_interval: Option<proxmox_network_types::openfabric::HelloInterval>,
+ pub csnp_interval: Option<proxmox_network_types::openfabric::CsnpInterval>,
+ pub hello_multiplier: Option<proxmox_network_types::openfabric::HelloMultiplier>,
+ pub is_ipv6: bool,
+}
+
+impl OpenFabricInterface {
+ pub fn fabric_id(&self) -> &OpenFabricRouterName {
+ &self.fabric_id
+ }
+ pub fn passive(&self) -> Option<bool> {
+ self.passive
+ }
+ pub fn hello_interval(&self) -> Option<proxmox_network_types::openfabric::HelloInterval> {
+ self.hello_interval
+ }
+ pub fn csnp_interval(&self) -> Option<proxmox_network_types::openfabric::CsnpInterval> {
+ self.csnp_interval
+ }
+ pub fn hello_multiplier(&self) -> Option<proxmox_network_types::openfabric::HelloMultiplier> {
+ self.hello_multiplier
+ }
+ pub fn set_hello_interval(
+ &mut self,
+ interval: impl Into<Option<proxmox_network_types::openfabric::HelloInterval>>,
+ ) {
+ self.hello_interval = interval.into();
+ }
+}
+
+#[derive(Error, Debug)]
+pub enum OpenFabricInterfaceError {
+ #[error("Unknown error converting to OpenFabricInterface")]
+ UnknownError,
+ #[error("Error converting router name")]
+ RouterNameError(#[from] RouterNameError),
+ #[error("Error parsing frr word")]
+ FrrWordParse(#[from] FrrWordError),
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 08/17] frr: add ospf types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (7 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 07/17] frr: add openfabric types Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 09/17] frr: add route-map types Gabriel Goller
` (44 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Add OSPF-specific FRR types. This also reuses the types from
proxmox-network-types.
The NetworkType FRR option is implemented here, but not exposed to the
interface, as we want to keep it simple. So the UI has a simple
"unnumbered" check and we set the NetworkType to "Point-to-Point". The
other options are also not that interesting.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/src/lib.rs | 20 ++++++
proxmox-frr/src/ospf.rs | 135 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 155 insertions(+)
create mode 100644 proxmox-frr/src/ospf.rs
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
index d54f83127501..1160a71b3d9c 100644
--- a/proxmox-frr/src/lib.rs
+++ b/proxmox-frr/src/lib.rs
@@ -1,4 +1,5 @@
pub mod openfabric;
+pub mod ospf;
use std::{collections::BTreeMap, fmt::Display, str::FromStr};
use serde::{Deserialize, Serialize};
@@ -31,6 +32,25 @@ impl Display for InterfaceName {
}
}
+/// Generic FRR Interface.
+#[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize, PartialOrd, Ord)]
+pub enum Interface {
+ OpenFabric(openfabric::OpenFabricInterface),
+ Ospf(ospf::OspfInterface),
+}
+
+impl From<openfabric::OpenFabricInterface> for Interface {
+ fn from(value: openfabric::OpenFabricInterface) -> Self {
+ Self::OpenFabric(value)
+ }
+}
+
+impl From<ospf::OspfInterface> for Interface {
+ fn from(value: ospf::OspfInterface) -> Self {
+ Self::Ospf(value)
+ }
+}
+
#[derive(Error, Debug)]
pub enum FrrWordError {
#[error("word is empty")]
diff --git a/proxmox-frr/src/ospf.rs b/proxmox-frr/src/ospf.rs
new file mode 100644
index 000000000000..f41b1c0d400a
--- /dev/null
+++ b/proxmox-frr/src/ospf.rs
@@ -0,0 +1,135 @@
+use std::fmt::Debug;
+use std::fmt::Display;
+use std::net::Ipv4Addr;
+
+use serde::{Deserialize, Serialize};
+
+use thiserror::Error;
+
+use crate::{FrrWord, FrrWordError};
+
+/// The name of the ospf frr router. There is only one ospf fabric possible in frr (ignoring
+/// multiple invocations of the ospfd daemon) and the separation is done with areas. Still,
+/// different areas have the same frr router, so the name of the router is just "ospf" in "router
+/// ospf". This type still contains the Area so that we can insert it in the Hashmap.
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub struct OspfRouterName(Area);
+
+impl From<Area> for OspfRouterName {
+ fn from(value: Area) -> Self {
+ Self(value)
+ }
+}
+
+impl Display for OspfRouterName {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "ospf")
+ }
+}
+
+#[derive(Error, Debug)]
+pub enum AreaParsingError {
+ #[error("Invalid area idenitifier. Area must be a number or an ipv4 address.")]
+ InvalidArea,
+ #[error("Invalid area idenitifier. Missing 'area' prefix.")]
+ MissingPrefix,
+ #[error("Error parsing to FrrWord")]
+ FrrWordError(#[from] FrrWordError),
+}
+
+/// The OSPF Area. Most commonly, this is just a number, e.g. 5, but sometimes also a
+/// pseudo-ipaddress, e.g. 0.0.0.0
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub struct Area(FrrWord);
+
+impl TryFrom<FrrWord> for Area {
+ type Error = AreaParsingError;
+
+ fn try_from(value: FrrWord) -> Result<Self, Self::Error> {
+ Area::new(value)
+ }
+}
+
+impl Area {
+ pub fn new(name: FrrWord) -> Result<Self, AreaParsingError> {
+ if name.as_ref().parse::<u32>().is_ok() || name.as_ref().parse::<Ipv4Addr>().is_ok() {
+ Ok(Self(name))
+ } else {
+ Err(AreaParsingError::InvalidArea)
+ }
+ }
+}
+
+impl Display for Area {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "area {}", self.0)
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub struct OspfRouter {
+ pub router_id: Ipv4Addr,
+}
+
+impl OspfRouter {
+ pub fn new(router_id: Ipv4Addr) -> Self {
+ Self { router_id }
+ }
+
+ pub fn router_id(&self) -> &Ipv4Addr {
+ &self.router_id
+ }
+}
+
+#[derive(Error, Debug)]
+pub enum OspfInterfaceError {
+ #[error("Error parsing area")]
+ AreaParsingError(#[from] AreaParsingError),
+ #[error("Error parsing frr word")]
+ FrrWordParse(#[from] FrrWordError),
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub enum NetworkType {
+ Broadcast,
+ NonBroadcast,
+ /// If the interface is unnumbered (i.e. no specific ip-address at the interface, but the
+ /// router-id).
+ ///
+ /// If OSPF is used in an unnumbered way, you don't need to configure peer-to-peer (e.g. /31)
+ /// addresses at every interface, but you just need to set the router-id at the interface. You
+ /// also need to configure the `ip ospf network point-to-point` FRR option.
+ PointToPoint,
+ PointToMultipoint,
+}
+
+impl Display for NetworkType {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ NetworkType::Broadcast => write!(f, "broadcast"),
+ NetworkType::NonBroadcast => write!(f, "non-broadcast"),
+ NetworkType::PointToPoint => write!(f, "point-to-point"),
+ NetworkType::PointToMultipoint => write!(f, "point-to-multicast"),
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub struct OspfInterface {
+ // Note: an interface can only be a part of a single area(so no vec needed here)
+ pub area: Area,
+ pub passive: Option<bool>,
+ pub network_type: Option<NetworkType>,
+}
+
+impl OspfInterface {
+ pub fn area(&self) -> &Area {
+ &self.area
+ }
+ pub fn passive(&self) -> &Option<bool> {
+ &self.passive
+ }
+ pub fn network_type(&self) -> &Option<NetworkType> {
+ &self.network_type
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 09/17] frr: add route-map types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (8 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 08/17] frr: add ospf types Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 10/17] frr: add generic types over openfabric and ospf Gabriel Goller
` (43 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Only a very limited featureset of the route-maps is implemented here,
only the stuff needed by the fabrics. Once standalone route-maps will
make it into pve, we will build these out and maybe rework them a
little.
We need the RouteMaps for the Fabrics, because otherwise, the routes
between to the route-ids will be distibuted, but won't be pingable,
because because the source address is wrong. By rewriting the source we
guarantee that a ping will always find it's way back to the source
router-id.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/src/lib.rs | 2 +
proxmox-frr/src/route_map.rs | 128 +++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+)
create mode 100644 proxmox-frr/src/route_map.rs
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
index 1160a71b3d9c..1a657c087ff0 100644
--- a/proxmox-frr/src/lib.rs
+++ b/proxmox-frr/src/lib.rs
@@ -1,7 +1,9 @@
pub mod openfabric;
pub mod ospf;
+pub mod route_map;
use std::{collections::BTreeMap, fmt::Display, str::FromStr};
+use route_map::{AccessList, AccessListName, ProtocolRouteMap, RouteMap};
use serde::{Deserialize, Serialize};
use serde_with::{DeserializeFromStr, SerializeDisplay};
use thiserror::Error;
diff --git a/proxmox-frr/src/route_map.rs b/proxmox-frr/src/route_map.rs
new file mode 100644
index 000000000000..16ff87bfa6aa
--- /dev/null
+++ b/proxmox-frr/src/route_map.rs
@@ -0,0 +1,128 @@
+use std::{
+ fmt::{self, Display},
+ net::IpAddr,
+};
+
+use proxmox_network_types::address::Cidr;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum AccessAction {
+ Permit,
+ Deny,
+}
+
+impl fmt::Display for AccessAction {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ AccessAction::Permit => write!(f, "permit"),
+ AccessAction::Deny => write!(f, "deny"),
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AccessListRule {
+ pub action: AccessAction,
+ pub network: Cidr,
+ pub seq: Option<u32>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct AccessListName(String);
+
+impl AccessListName {
+ pub fn new(name: String) -> AccessListName {
+ AccessListName(name)
+ }
+}
+
+impl Display for AccessListName {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct AccessList {
+ pub name: AccessListName,
+ pub rules: Vec<AccessListRule>,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum RouteMapMatch {
+ IpAddress(AccessListName),
+ IpNextHop(String),
+}
+
+impl Display for RouteMapMatch {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ RouteMapMatch::IpAddress(name) => write!(f, "match ip address {}", name),
+ RouteMapMatch::IpNextHop(name) => write!(f, "match ip next-hop {}", name),
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub enum RouteMapSet {
+ LocalPreference(u32),
+ IpSrc(IpAddr),
+ Metric(u32),
+ Community(String),
+}
+
+impl Display for RouteMapSet {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ RouteMapSet::LocalPreference(pref) => write!(f, "set local-preference {}", pref),
+ RouteMapSet::IpSrc(addr) => write!(f, "set src {}", addr),
+ RouteMapSet::Metric(metric) => write!(f, "set metric {}", metric),
+ RouteMapSet::Community(community) => write!(f, "set community {}", community),
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct RouteMapName(String);
+
+impl RouteMapName {
+ pub fn new(name: String) -> RouteMapName {
+ RouteMapName(name)
+ }
+}
+
+impl Display for RouteMapName {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct RouteMap {
+ pub name: RouteMapName,
+ pub seq: u32,
+ pub action: AccessAction,
+ pub matches: Vec<RouteMapMatch>,
+ pub sets: Vec<RouteMapSet>,
+}
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum ProtocolType {
+ OpenFabric,
+ Ospf,
+}
+
+impl Display for ProtocolType {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ match self {
+ ProtocolType::OpenFabric => write!(f, "openfabric"),
+ ProtocolType::Ospf => write!(f, "ospf"),
+ }
+ }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct ProtocolRouteMap {
+ pub protocol: ProtocolType,
+ pub routemap_name: RouteMapName,
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 10/17] frr: add generic types over openfabric and ospf
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (9 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 09/17] frr: add route-map types Gabriel Goller
@ 2025-03-28 17:12 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 11/17] frr: add serializer for all FRR types Gabriel Goller
` (42 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:12 UTC (permalink / raw)
To: pve-devel
Add generic FRR types that contain openfabric and ospf variants. Also
add the FrrConfig, which holds the whole FRR configuration in a single
struct, which will then be serialized.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/src/lib.rs | 79 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 79 insertions(+)
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
index 1a657c087ff0..08abdd371653 100644
--- a/proxmox-frr/src/lib.rs
+++ b/proxmox-frr/src/lib.rs
@@ -16,6 +16,46 @@ pub enum RouterNameError {
FrrWordError(#[from] FrrWordError),
}
+/// Generic FRR router.
+///
+/// This generic FRR router contains all the variants that are allowed.
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, PartialOrd, Ord)]
+pub enum Router {
+ OpenFabric(openfabric::OpenFabricRouter),
+ Ospf(ospf::OspfRouter),
+}
+
+impl From<openfabric::OpenFabricRouter> for Router {
+ fn from(value: openfabric::OpenFabricRouter) -> Self {
+ Router::OpenFabric(value)
+ }
+}
+
+/// Generic FRR routername.
+///
+/// Can vary between different router-types. Some have `router <protocol> <name>`, others have
+/// `router <protocol> <process-id>`.
+#[derive(Clone, Debug, PartialEq, Eq, Hash, SerializeDisplay, PartialOrd, Ord)]
+pub enum RouterName {
+ OpenFabric(openfabric::OpenFabricRouterName),
+ Ospf(ospf::OspfRouterName),
+}
+
+impl From<openfabric::OpenFabricRouterName> for RouterName {
+ fn from(value: openfabric::OpenFabricRouterName) -> Self {
+ Self::OpenFabric(value)
+ }
+}
+
+impl Display for RouterName {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ match self {
+ Self::OpenFabric(r) => r.fmt(f),
+ Self::Ospf(r) => r.fmt(f),
+ }
+ }
+}
+
/// The interface name is the same on ospf and openfabric, but it is an enum so we can have two
/// different entries in the hashmap. This allows us to have an interface in an ospf and openfabric
/// fabric.
@@ -135,3 +175,42 @@ impl Display for CommonInterfaceName {
self.0.fmt(f)
}
}
+
+/// Main FRR config.
+///
+/// Contains the two main frr building blocks: routers and interfaces. To ease construction use the
+/// [`FrrConfigBuilder`], which converts the intermediate representation to the FRR-specific
+/// representation here. Eventually we can add different control options here, such as: `line vty`.
+#[derive(Clone, Debug, PartialEq, Eq, Default)]
+pub struct FrrConfig {
+ pub router: BTreeMap<RouterName, Router>,
+ pub interfaces: BTreeMap<InterfaceName, Interface>,
+ pub access_lists: BTreeMap<AccessListName, AccessList>,
+ pub routemaps: Vec<RouteMap>,
+ pub protocol_routemaps: Vec<ProtocolRouteMap>,
+}
+
+impl FrrConfig {
+ pub fn new() -> Self {
+ Self::default()
+ }
+
+ pub fn router(&self) -> impl Iterator<Item = (&RouterName, &Router)> + '_ {
+ self.router.iter()
+ }
+
+ pub fn interfaces(&self) -> impl Iterator<Item = (&InterfaceName, &Interface)> + '_ {
+ self.interfaces.iter()
+ }
+
+ pub fn access_lists(&self) -> impl Iterator<Item = (&AccessListName, &AccessList)> + '_ {
+ self.access_lists.iter()
+ }
+ pub fn routemaps(&self) -> impl Iterator<Item = &RouteMap> + '_ {
+ self.routemaps.iter()
+ }
+
+ pub fn protocol_routemaps(&self) -> impl Iterator<Item = &ProtocolRouteMap> + '_ {
+ self.protocol_routemaps.iter()
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 11/17] frr: add serializer for all FRR types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (10 preceding siblings ...)
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 10/17] frr: add generic types over openfabric and ospf Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config Gabriel Goller
` (41 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
This custom serializer will serialize all the FRR types into a string,
which is the FRR config.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/src/lib.rs | 2 +
proxmox-frr/src/serializer.rs | 192 ++++++++++++++++++++++++++++++++++
2 files changed, 194 insertions(+)
create mode 100644 proxmox-frr/src/serializer.rs
diff --git a/proxmox-frr/src/lib.rs b/proxmox-frr/src/lib.rs
index 08abdd371653..5b2bdc2c9d72 100644
--- a/proxmox-frr/src/lib.rs
+++ b/proxmox-frr/src/lib.rs
@@ -1,6 +1,8 @@
pub mod openfabric;
pub mod ospf;
pub mod route_map;
+pub mod serializer;
+
use std::{collections::BTreeMap, fmt::Display, str::FromStr};
use route_map::{AccessList, AccessListName, ProtocolRouteMap, RouteMap};
diff --git a/proxmox-frr/src/serializer.rs b/proxmox-frr/src/serializer.rs
new file mode 100644
index 000000000000..631956aeb099
--- /dev/null
+++ b/proxmox-frr/src/serializer.rs
@@ -0,0 +1,192 @@
+use std::fmt::{self, Write};
+
+use crate::{
+ openfabric::{OpenFabricInterface, OpenFabricRouter},
+ ospf::{OspfInterface, OspfRouter},
+ route_map::{AccessList, AccessListName, ProtocolRouteMap, RouteMap},
+ FrrConfig, Interface, InterfaceName, Router, RouterName,
+};
+
+pub struct FrrConfigBlob<'a> {
+ buf: &'a mut (dyn Write + 'a),
+}
+
+impl Write for FrrConfigBlob<'_> {
+ fn write_str(&mut self, s: &str) -> Result<(), fmt::Error> {
+ self.buf.write_str(s)
+ }
+}
+
+pub trait FrrSerializer {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result;
+}
+
+pub fn to_raw_config(frr_config: &FrrConfig) -> Result<Vec<String>, anyhow::Error> {
+ let mut out = String::new();
+ let mut blob = FrrConfigBlob { buf: &mut out };
+ frr_config.serialize(&mut blob)?;
+
+ Ok(out.as_str().lines().map(String::from).collect())
+}
+
+pub fn dump(config: &FrrConfig) -> Result<String, anyhow::Error> {
+ let mut out = String::new();
+ let mut blob = FrrConfigBlob { buf: &mut out };
+ config.serialize(&mut blob)?;
+ Ok(out)
+}
+
+impl FrrSerializer for &FrrConfig {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ self.router().try_for_each(|router| router.serialize(f))?;
+ self.interfaces()
+ .try_for_each(|interface| interface.serialize(f))?;
+ self.access_lists().try_for_each(|list| list.serialize(f))?;
+ self.routemaps().try_for_each(|map| map.serialize(f))?;
+ self.protocol_routemaps()
+ .try_for_each(|pm| pm.serialize(f))?;
+ Ok(())
+ }
+}
+
+impl FrrSerializer for (&RouterName, &Router) {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ let router_name = self.0;
+ let router = self.1;
+ writeln!(f, "router {router_name}")?;
+ router.serialize(f)?;
+ writeln!(f, "exit")?;
+ writeln!(f, "!")?;
+ Ok(())
+ }
+}
+
+impl FrrSerializer for (&InterfaceName, &Interface) {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ let interface_name = self.0;
+ let interface = self.1;
+ writeln!(f, "interface {interface_name}")?;
+ interface.serialize(f)?;
+ writeln!(f, "exit")?;
+ writeln!(f, "!")?;
+ Ok(())
+ }
+}
+
+impl FrrSerializer for (&AccessListName, &AccessList) {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ self.1.serialize(f)?;
+ writeln!(f, "!")
+ }
+}
+
+impl FrrSerializer for Interface {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ match self {
+ Interface::OpenFabric(openfabric_interface) => openfabric_interface.serialize(f)?,
+ Interface::Ospf(ospf_interface) => ospf_interface.serialize(f)?,
+ }
+ Ok(())
+ }
+}
+
+impl FrrSerializer for OpenFabricInterface {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ if self.is_ipv6 {
+ writeln!(f, " ipv6 router {}", self.fabric_id())?;
+ } else {
+ writeln!(f, " ip router {}", self.fabric_id())?;
+ }
+ if self.passive() == Some(true) {
+ writeln!(f, " openfabric passive")?;
+ }
+ if let Some(interval) = self.hello_interval() {
+ writeln!(f, " openfabric hello-interval {interval}",)?;
+ }
+ if let Some(multiplier) = self.hello_multiplier() {
+ writeln!(f, " openfabric hello-multiplier {multiplier}",)?;
+ }
+ if let Some(interval) = self.csnp_interval() {
+ writeln!(f, " openfabric csnp-interval {interval}",)?;
+ }
+ Ok(())
+ }
+}
+
+impl FrrSerializer for OspfInterface {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ writeln!(f, " ip ospf {}", self.area())?;
+ if *self.passive() == Some(true) {
+ writeln!(f, " ip ospf passive")?;
+ }
+ if let Some(network_type) = self.network_type() {
+ writeln!(f, " ip ospf network {network_type}")?;
+ }
+ Ok(())
+ }
+}
+
+impl FrrSerializer for &Router {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ match self {
+ Router::OpenFabric(open_fabric_router) => open_fabric_router.serialize(f),
+ Router::Ospf(ospf_router) => ospf_router.serialize(f),
+ }
+ }
+}
+
+impl FrrSerializer for &OpenFabricRouter {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ writeln!(f, " net {}", self.net())?;
+ Ok(())
+ }
+}
+
+impl FrrSerializer for &OspfRouter {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ writeln!(f, " ospf router-id {}", self.router_id())?;
+ Ok(())
+ }
+}
+
+impl FrrSerializer for &AccessList {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ for i in &self.rules {
+ if i.network.is_ipv6() {
+ write!(f, "ipv6 ")?;
+ }
+ write!(f, "access-list {} ", self.name)?;
+ if let Some(seq) = i.seq {
+ write!(f, "seq {seq} ")?;
+ }
+ write!(f, "{} ", i.action)?;
+ writeln!(f, "{}", i.network)?;
+ }
+ Ok(())
+ }
+}
+
+impl FrrSerializer for &RouteMap {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ writeln!(f, "route-map {} {} {}", self.name, self.action, self.seq)?;
+ for i in &self.matches {
+ writeln!(f, " {}", i)?;
+ }
+ for i in &self.sets {
+ writeln!(f, " {}", i)?;
+ }
+ writeln!(f, "exit")?;
+ writeln!(f, "!")
+ }
+}
+
+impl FrrSerializer for &ProtocolRouteMap {
+ fn serialize(&self, f: &mut FrrConfigBlob<'_>) -> fmt::Result {
+ writeln!(
+ f,
+ "ip protocol {} route-map {}",
+ self.protocol, self.routemap_name
+ )?;
+ Ok(())
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (11 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 11/17] frr: add serializer for all FRR types Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-31 13:48 ` Christoph Heiss
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 13/17] ve-config: add ospf section-config Gabriel Goller
` (40 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
This is the main openfabric configuration. It is used to parse from the
section-config file (`/etc/pve/sdn/fabrics/openfabric.cfg`) and is also
returned from the api.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-ve-config/Cargo.toml | 9 +-
.../src/sdn/fabric/openfabric/mod.rs | 291 ++++++++++++++++++
2 files changed, 297 insertions(+), 3 deletions(-)
create mode 100644 proxmox-ve-config/src/sdn/fabric/openfabric/mod.rs
diff --git a/proxmox-ve-config/Cargo.toml b/proxmox-ve-config/Cargo.toml
index 4906d77550f3..3f7639efa153 100644
--- a/proxmox-ve-config/Cargo.toml
+++ b/proxmox-ve-config/Cargo.toml
@@ -10,14 +10,17 @@ exclude.workspace = true
log = "0.4"
anyhow = "1"
nix = "0.26"
-thiserror = "1.0.59"
+thiserror = { workspace = true }
-serde = { version = "1", features = [ "derive" ] }
+serde = { workspace = true, features = [ "derive" ] }
+serde_with = { workspace = true }
serde_json = "1"
serde_plain = "1"
-serde_with = "3"
+tracing = "0.1"
proxmox-schema = "4"
+proxmox-section-config = { workspace = true }
+proxmox-serde = { version = "0.1.2" }
proxmox-sys = "0.6.4"
proxmox-sortable-macro = "0.1.3"
proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
diff --git a/proxmox-ve-config/src/sdn/fabric/openfabric/mod.rs b/proxmox-ve-config/src/sdn/fabric/openfabric/mod.rs
new file mode 100644
index 000000000000..ae7c7eb5ac4f
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/openfabric/mod.rs
@@ -0,0 +1,291 @@
+#[cfg(feature = "frr")]
+pub mod frr;
+pub mod validation;
+
+use proxmox_network_types::{
+ address::{Cidr, Ipv4Cidr, Ipv6Cidr},
+ hostname::Hostname,
+ openfabric::{CsnpInterval, HelloInterval, HelloMultiplier},
+};
+use proxmox_schema::property_string::PropertyString;
+use proxmox_sortable_macro::sortable;
+use serde_with::{DeserializeFromStr, SerializeDisplay};
+use std::{fmt::Display, net::IpAddr, str::FromStr, sync::OnceLock};
+
+use proxmox_schema::{
+ ApiStringFormat, ApiType, ArraySchema, BooleanSchema, IntegerSchema, ObjectSchema, Schema,
+ StringSchema,
+};
+use proxmox_section_config::{typed::ApiSectionDataEntry, SectionConfig, SectionConfigPlugin};
+use proxmox_serde::string_as_bool;
+use serde::{Deserialize, Serialize};
+
+#[sortable]
+const FABRIC_SCHEMA: ObjectSchema = ObjectSchema::new(
+ "fabric schema",
+ &sorted!([
+ ("fabric_id", false, &StringSchema::new("FabricId").schema()),
+ (
+ "hello_interval",
+ true,
+ &IntegerSchema::new("OpenFabric hello_interval in seconds")
+ .minimum(1)
+ .maximum(600)
+ .schema(),
+ ),
+ (
+ "loopback_prefix",
+ false,
+ &StringSchema::new("Loopback IP prefix").min_length(1).schema()
+ ),
+ ]),
+);
+
+#[sortable]
+const INTERFACE_SCHEMA: Schema = ObjectSchema::new(
+ "interface",
+ &sorted!([
+ (
+ "name",
+ false,
+ &StringSchema::new("Interface name")
+ .min_length(1)
+ .max_length(15)
+ .schema(),
+ ),
+ (
+ "ip",
+ true,
+ &StringSchema::new("Interface IPv4 address").schema()
+ ),
+ (
+ "ipv6",
+ true,
+ &StringSchema::new("Interface IPv6 address").schema()
+ ),
+ (
+ "passive",
+ true,
+ &BooleanSchema::new("OpenFabric passive mode for this interface").schema(),
+ ),
+ (
+ "hello_interval",
+ true,
+ &IntegerSchema::new("OpenFabric Hello interval in seconds")
+ .minimum(1)
+ .maximum(600)
+ .schema(),
+ ),
+ (
+ "csnp_interval",
+ true,
+ &IntegerSchema::new("OpenFabric csnp interval in seconds")
+ .minimum(1)
+ .maximum(600)
+ .schema()
+ ),
+ (
+ "hello_multiplier",
+ true,
+ &IntegerSchema::new("OpenFabric multiplier for Hello holding time")
+ .minimum(2)
+ .maximum(100)
+ .schema()
+ ),
+ ]),
+)
+.schema();
+
+#[sortable]
+const NODE_SCHEMA: ObjectSchema = ObjectSchema::new(
+ "node schema",
+ &sorted!([
+ (
+ "node_id",
+ false,
+ &StringSchema::new("NodeId containing the fabric_id and hostname").schema(),
+ ),
+ (
+ "interface",
+ false,
+ &ArraySchema::new(
+ "OpenFabric name",
+ &StringSchema::new("OpenFabric Interface")
+ .format(&ApiStringFormat::PropertyString(&INTERFACE_SCHEMA))
+ .schema(),
+ )
+ .schema(),
+ ),
+ (
+ "router_id",
+ false,
+ &StringSchema::new("OpenFabric router-id")
+ .min_length(3)
+ .schema(),
+ ),
+ ]),
+);
+
+const ID_SCHEMA: Schema = StringSchema::new("id").min_length(2).schema();
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FabricSection {
+ pub fabric_id: FabricId,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub hello_interval: Option<HelloInterval>,
+ pub loopback_prefix: Cidr,
+ pub ty: String,
+}
+
+#[derive(
+ SerializeDisplay, DeserializeFromStr, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash,
+)]
+pub struct FabricId(String);
+
+impl FabricId {
+ pub fn new(id: impl Into<String>) -> Result<Self, anyhow::Error> {
+ let value = id.into();
+ if value.len() <= 8 {
+ Ok(Self(value))
+ }else {
+ anyhow::bail!("FabricId has to be shorter than 8 characters");
+ }
+ }
+}
+
+impl AsRef<str> for FabricId {
+ fn as_ref(&self) -> &str {
+ &self.0
+ }
+}
+
+impl FromStr for FabricId {
+ type Err = anyhow::Error;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ Self::new(s)
+ }
+}
+
+impl From<String> for FabricId {
+ fn from(value: String) -> Self {
+ FabricId(value)
+ }
+}
+
+impl Display for FabricId {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeSection {
+ pub router_id: IpAddr,
+ pub interface: Vec<PropertyString<InterfaceProperties>>,
+ pub node_id: NodeId,
+ pub ty: String,
+}
+
+#[derive(SerializeDisplay, DeserializeFromStr, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeId {
+ pub fabric_id: FabricId,
+ pub node: Hostname,
+}
+
+impl Display for NodeId {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}_{}", self.fabric_id, self.node)
+ }
+}
+
+impl NodeId {
+ pub fn new(fabric_id: FabricId, node: Hostname) -> NodeId {
+ NodeId { fabric_id, node }
+ }
+}
+
+impl FromStr for NodeId {
+ type Err = anyhow::Error;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if let Some((fabric_id, hostname)) = s.split_once('_') {
+ Ok(NodeId {
+ fabric_id: fabric_id.to_owned().into(),
+ node: hostname.to_owned().into(),
+ })
+ } else {
+ anyhow::bail!("nothing works");
+ }
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct InterfaceProperties {
+ pub name: String,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ #[serde(default, with = "string_as_bool")]
+ pub passive: Option<bool>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub hello_interval: Option<HelloInterval>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub csnp_interval: Option<CsnpInterval>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub hello_multiplier: Option<HelloMultiplier>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub ip: Option<Ipv4Cidr>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub ipv6: Option<Ipv6Cidr>,
+}
+
+impl InterfaceProperties {
+ pub fn passive(&self) -> Option<bool> {
+ self.passive
+ }
+}
+
+impl ApiType for InterfaceProperties {
+ const API_SCHEMA: Schema = INTERFACE_SCHEMA;
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(untagged)]
+pub enum OpenFabricSectionConfig {
+ Fabric(FabricSection),
+ Node(NodeSection),
+}
+
+impl ApiSectionDataEntry for OpenFabricSectionConfig {
+ const INTERNALLY_TAGGED: Option<&'static str> = Some("ty");
+
+ fn section_config() -> &'static SectionConfig {
+ static SC: OnceLock<SectionConfig> = OnceLock::new();
+
+ SC.get_or_init(|| {
+ let mut config = SectionConfig::new(&ID_SCHEMA);
+
+ let fabric_plugin = SectionConfigPlugin::new(
+ "fabric".to_string(),
+ Some("fabric_id".to_string()),
+ &FABRIC_SCHEMA,
+ );
+ config.register_plugin(fabric_plugin);
+
+ let node_plugin = SectionConfigPlugin::new(
+ "node".to_string(),
+ Some("node_id".to_string()),
+ &NODE_SCHEMA,
+ );
+ config.register_plugin(node_plugin);
+
+ config
+ })
+ }
+
+ fn section_type(&self) -> &'static str {
+ match self {
+ Self::Node(_) => "node",
+ Self::Fabric(_) => "fabric",
+ }
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config Gabriel Goller
@ 2025-03-31 13:48 ` Christoph Heiss
2025-03-31 15:04 ` Gabriel Goller
0 siblings, 1 reply; 97+ messages in thread
From: Christoph Heiss @ 2025-03-31 13:48 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox VE development discussion
On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
> This is the main openfabric configuration. It is used to parse from the
> section-config file (`/etc/pve/sdn/fabrics/openfabric.cfg`) and is also
> returned from the api.
>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> proxmox-ve-config/Cargo.toml | 9 +-
> .../src/sdn/fabric/openfabric/mod.rs | 291 ++++++++++++++++++
> 2 files changed, 297 insertions(+), 3 deletions(-)
> create mode 100644 proxmox-ve-config/src/sdn/fabric/openfabric/mod.rs
>
> diff --git a/proxmox-ve-config/Cargo.toml b/proxmox-ve-config/Cargo.toml
> index 4906d77550f3..3f7639efa153 100644
> --- a/proxmox-ve-config/Cargo.toml
> +++ b/proxmox-ve-config/Cargo.toml
> @@ -10,14 +10,17 @@ exclude.workspace = true
> log = "0.4"
> anyhow = "1"
> nix = "0.26"
> -thiserror = "1.0.59"
> +thiserror = { workspace = true }
>
> -serde = { version = "1", features = [ "derive" ] }
> +serde = { workspace = true, features = [ "derive" ] }
> +serde_with = { workspace = true }
> serde_json = "1"
> serde_plain = "1"
> -serde_with = "3"
> +tracing = "0.1"
>
> proxmox-schema = "4"
> +proxmox-section-config = { workspace = true }
> +proxmox-serde = { version = "0.1.2" }
> proxmox-sys = "0.6.4"
> proxmox-sortable-macro = "0.1.3"
> proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
nit: These changes should be reflected in debian/control too.
Its sync'd up later in patch #16 ("ve-config: add section-config to frr
types conversion") as part of another change in Cargo.toml, but they
should always be grouped together, IMO.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config
2025-03-31 13:48 ` Christoph Heiss
@ 2025-03-31 15:04 ` Gabriel Goller
0 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-31 15:04 UTC (permalink / raw)
To: Christoph Heiss; +Cc: Proxmox VE development discussion
On 31.03.2025 15:48, Christoph Heiss wrote:
>On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
>> This is the main openfabric configuration. It is used to parse from the
>> section-config file (`/etc/pve/sdn/fabrics/openfabric.cfg`) and is also
>> returned from the api.
>>
>> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
>> ---
>> proxmox-ve-config/Cargo.toml | 9 +-
>> .../src/sdn/fabric/openfabric/mod.rs | 291 ++++++++++++++++++
>> 2 files changed, 297 insertions(+), 3 deletions(-)
>> create mode 100644 proxmox-ve-config/src/sdn/fabric/openfabric/mod.rs
>>
>> diff --git a/proxmox-ve-config/Cargo.toml b/proxmox-ve-config/Cargo.toml
>> index 4906d77550f3..3f7639efa153 100644
>> --- a/proxmox-ve-config/Cargo.toml
>> +++ b/proxmox-ve-config/Cargo.toml
>> @@ -10,14 +10,17 @@ exclude.workspace = true
>> log = "0.4"
>> anyhow = "1"
>> nix = "0.26"
>> -thiserror = "1.0.59"
>> +thiserror = { workspace = true }
>>
>> -serde = { version = "1", features = [ "derive" ] }
>> +serde = { workspace = true, features = [ "derive" ] }
>> +serde_with = { workspace = true }
>> serde_json = "1"
>> serde_plain = "1"
>> -serde_with = "3"
>> +tracing = "0.1"
>>
>> proxmox-schema = "4"
>> +proxmox-section-config = { workspace = true }
>> +proxmox-serde = { version = "0.1.2" }
>> proxmox-sys = "0.6.4"
>> proxmox-sortable-macro = "0.1.3"
>> proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
>
>nit: These changes should be reflected in debian/control too.
>
>Its sync'd up later in patch #16 ("ve-config: add section-config to frr
>types conversion") as part of another change in Cargo.toml, but they
>should always be grouped together, IMO.
Oops, yeah, will fix this.
Also messed up the similar-asserts import and debian/control entry as in
your other reply.
Also changed from similar-asserts to insta, so this shouldn't be an
issue in the next version!
Thanks for reviewing!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH proxmox-ve-rs 13/17] ve-config: add ospf section-config
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (12 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 14/17] ve-config: add FRR conversion helpers for openfabric and ospf Gabriel Goller
` (39 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
This is the main configuration for OSPF. It is used to parse the section
config file and is returned from the api.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-ve-config/src/sdn/fabric/ospf/mod.rs | 245 +++++++++++++++++++
1 file changed, 245 insertions(+)
create mode 100644 proxmox-ve-config/src/sdn/fabric/ospf/mod.rs
diff --git a/proxmox-ve-config/src/sdn/fabric/ospf/mod.rs b/proxmox-ve-config/src/sdn/fabric/ospf/mod.rs
new file mode 100644
index 000000000000..59691f0e84f0
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/ospf/mod.rs
@@ -0,0 +1,245 @@
+#[cfg(feature = "frr")]
+pub mod frr;
+pub mod validation;
+
+use proxmox_network_types::address::Ipv4Cidr;
+use proxmox_network_types::hostname::Hostname;
+use proxmox_schema::property_string::PropertyString;
+
+use proxmox_schema::ObjectSchema;
+use proxmox_schema::{ApiStringFormat, ApiType, ArraySchema, BooleanSchema, Schema, StringSchema};
+use proxmox_section_config::{typed::ApiSectionDataEntry, SectionConfig, SectionConfigPlugin};
+use proxmox_sortable_macro::sortable;
+use serde::{Deserialize, Serialize};
+use serde_with::{DeserializeFromStr, SerializeDisplay};
+use std::fmt::Display;
+use std::net::Ipv4Addr;
+use std::str::FromStr;
+use std::sync::OnceLock;
+use thiserror::Error;
+
+#[sortable]
+const FABRIC_SCHEMA: ObjectSchema = ObjectSchema::new(
+ "fabric schema",
+ &sorted!([
+ (
+ "area",
+ false,
+ &StringSchema::new("Area identifier").min_length(1).schema()
+ ),
+ (
+ "loopback_prefix",
+ false,
+ &StringSchema::new("Loopback IP prefix").min_length(1).schema()
+ ),
+ ]),
+);
+
+#[sortable]
+const INTERFACE_SCHEMA: Schema = ObjectSchema::new(
+ "interface",
+ &sorted!([
+ (
+ "name",
+ false,
+ &StringSchema::new("Interface name")
+ .min_length(1)
+ .max_length(15)
+ .schema(),
+ ),
+ (
+ "passive",
+ true,
+ &BooleanSchema::new("passive interface").schema(),
+ ),
+ (
+ "unnumbered",
+ true,
+ &BooleanSchema::new("unnumbered interface").schema(),
+ ),
+ (
+ "ip",
+ true,
+ &StringSchema::new("Interface IPv4 address").schema()
+ ),
+ ]),
+)
+.schema();
+
+#[sortable]
+const NODE_SCHEMA: ObjectSchema = ObjectSchema::new(
+ "node schema",
+ &sorted!([
+ (
+ "node_id",
+ false,
+ &StringSchema::new("NodeId which contains area and node").schema()
+ ),
+ (
+ "interface",
+ false,
+ &ArraySchema::new(
+ "OSPF name",
+ &StringSchema::new("OSPF Interface")
+ .format(&ApiStringFormat::PropertyString(&INTERFACE_SCHEMA))
+ .schema(),
+ )
+ .schema(),
+ ),
+ (
+ "router_id",
+ false,
+ &StringSchema::new("OSPF router id").min_length(3).schema(),
+ ),
+ ]),
+);
+
+const ID_SCHEMA: Schema = StringSchema::new("id").min_length(2).schema();
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct InterfaceProperties {
+ pub name: String,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub passive: Option<bool>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub unnumbered: Option<bool>,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub ip: Option<Ipv4Cidr>,
+}
+
+impl ApiType for InterfaceProperties {
+ const API_SCHEMA: Schema = INTERFACE_SCHEMA;
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeSection {
+ pub node_id: NodeId,
+ pub router_id: Ipv4Addr,
+ pub interface: Vec<PropertyString<InterfaceProperties>>,
+ pub ty: String,
+}
+
+#[derive(SerializeDisplay, DeserializeFromStr, Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub struct NodeId {
+ pub area: Area,
+ pub node: Hostname,
+}
+
+impl Display for NodeId {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}_{}", self.area, self.node)
+ }
+}
+
+impl NodeId {
+ pub fn new(area: Area, node: Hostname) -> NodeId {
+ NodeId { area, node }
+ }
+}
+
+impl FromStr for NodeId {
+ type Err = anyhow::Error;
+
+ fn from_str(s: &str) -> Result<Self, Self::Err> {
+ if let Some((areaa, hostname)) = s.split_once('_') {
+ Ok(NodeId {
+ area: areaa.parse()?,
+ node: hostname.to_owned().into(),
+ })
+ } else {
+ anyhow::bail!("nothing works");
+ }
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct FabricSection {
+ pub area: Area,
+ pub loopback_prefix: Ipv4Cidr,
+ pub ty: String,
+}
+
+#[derive(Error, Debug)]
+pub enum AreaParsingError {
+ #[error("Invalid area identifier. Area must be a number or a ipv4 address.")]
+ InvalidArea,
+}
+
+#[derive(
+ Debug, DeserializeFromStr, SerializeDisplay, Hash, PartialEq, Eq, PartialOrd, Ord, Clone,
+)]
+pub struct Area(String);
+
+impl Area {
+ pub fn new(area: String) -> Result<Area, AreaParsingError> {
+ if (area.parse::<i32>().is_ok() || area.parse::<Ipv4Addr>().is_ok()) && area.len() <= 8 {
+ Ok(Self(area))
+ } else {
+ Err(AreaParsingError::InvalidArea)
+ }
+ }
+}
+
+impl FromStr for Area {
+ type Err = AreaParsingError;
+
+ fn from_str(value: &str) -> Result<Self, Self::Err> {
+ Area::new(value.to_owned())
+ }
+}
+
+impl AsRef<str> for Area {
+ fn as_ref(&self) -> &str {
+ &self.0
+ }
+}
+
+impl Display for Area {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ self.0.fmt(f)
+ }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(untagged)]
+pub enum OspfSectionConfig {
+ #[serde(rename = "fabric")]
+ Fabric(FabricSection),
+ #[serde(rename = "node")]
+ Node(NodeSection),
+}
+
+impl ApiSectionDataEntry for OspfSectionConfig {
+ const INTERNALLY_TAGGED: Option<&'static str> = Some("ty");
+
+ fn section_config() -> &'static SectionConfig {
+ static SC: OnceLock<SectionConfig> = OnceLock::new();
+
+ SC.get_or_init(|| {
+ let mut config = SectionConfig::new(&ID_SCHEMA);
+
+ let fabric_plugin = SectionConfigPlugin::new(
+ "fabric".to_string(),
+ Some("area".to_string()),
+ &FABRIC_SCHEMA,
+ );
+ config.register_plugin(fabric_plugin);
+
+ let node_plugin = SectionConfigPlugin::new(
+ "node".to_string(),
+ Some("node_id".to_string()),
+ &NODE_SCHEMA,
+ );
+ config.register_plugin(node_plugin);
+
+ config
+ })
+ }
+
+ fn section_type(&self) -> &'static str {
+ match self {
+ Self::Node(_) => "node",
+ Self::Fabric(_) => "fabric",
+ }
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 14/17] ve-config: add FRR conversion helpers for openfabric and ospf
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (13 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 13/17] ve-config: add ospf section-config Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 15/17] ve-config: add validation for section-config Gabriel Goller
` (38 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add conversion helpers for FRR interfaces. We can't put these in eg.
`TryInto` implementations, as we need a tupel and tupels are foreign
types. Create a simple conversion function that converts the OpenFabric
and OSPF interfaces to FRR interfaces.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.../src/sdn/fabric/openfabric/frr.rs | 24 +++++++++++++++
proxmox-ve-config/src/sdn/fabric/ospf/frr.rs | 29 +++++++++++++++++++
2 files changed, 53 insertions(+)
create mode 100644 proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs
create mode 100644 proxmox-ve-config/src/sdn/fabric/ospf/frr.rs
diff --git a/proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs b/proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs
new file mode 100644
index 000000000000..682fe62ab72f
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs
@@ -0,0 +1,24 @@
+use proxmox_frr::{
+ openfabric::{OpenFabricInterface, OpenFabricInterfaceError},
+ FrrWord,
+};
+
+use super::{FabricId, InterfaceProperties};
+
+impl InterfaceProperties {
+ pub fn to_frr_interface(
+ &self,
+ fabric_id: &FabricId,
+ is_ipv6: bool,
+ ) -> Result<OpenFabricInterface, OpenFabricInterfaceError> {
+ let frr_word = FrrWord::new(fabric_id.to_string())?;
+ Ok(OpenFabricInterface {
+ fabric_id: frr_word.into(),
+ passive: self.passive(),
+ hello_interval: self.hello_interval,
+ csnp_interval: self.csnp_interval,
+ hello_multiplier: self.hello_multiplier,
+ is_ipv6,
+ })
+ }
+}
diff --git a/proxmox-ve-config/src/sdn/fabric/ospf/frr.rs b/proxmox-ve-config/src/sdn/fabric/ospf/frr.rs
new file mode 100644
index 000000000000..9d493b60efd5
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/ospf/frr.rs
@@ -0,0 +1,29 @@
+use proxmox_frr::{
+ ospf::{NetworkType, OspfInterface, OspfInterfaceError, OspfRouter},
+ FrrWord,
+};
+
+use super::{Area, InterfaceProperties, NodeSection};
+
+impl From<NodeSection> for OspfRouter {
+ fn from(val: NodeSection) -> Self {
+ OspfRouter {
+ router_id: val.router_id,
+ }
+ }
+}
+
+impl InterfaceProperties {
+ pub fn to_frr_interface(&self, area: &Area) -> Result<OspfInterface, OspfInterfaceError> {
+ let frr_word = FrrWord::new(area.to_string())?;
+ Ok(OspfInterface {
+ area: frr_word.try_into()?,
+ passive: self.passive,
+ network_type: if let Some(true) = self.unnumbered {
+ Some(NetworkType::PointToPoint)
+ } else {
+ None
+ },
+ })
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 15/17] ve-config: add validation for section-config
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (14 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 14/17] ve-config: add FRR conversion helpers for openfabric and ospf Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion Gabriel Goller
` (37 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Our section-config is nested 3 times (fabric -> node -> interfaces), but
as only one indentation level (two with propertyStrings) are possible in
section-config configuration files, we need to add some validation to
ensure that the config is valid. In the future, more stuff to be
validated can be added here, but currently we check:
* if the router-id is unique
* if the node refers to a existing fabric
* if the router-ids are in the specified loopback prefix
Our Section-Config is structured like this:
fabric: test
fabric-option: this
node: test_pve0
node-option: that
The key to the node section is called the `NodeId` and consist of two
parts: `test`, which is the fabric, and `pve0`, which is the nodename.
The validation checks if the `test` fabric exists.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
proxmox-ve-config/src/sdn/fabric/mod.rs | 44 +++++++++++++++
.../src/sdn/fabric/openfabric/validation.rs | 56 +++++++++++++++++++
.../src/sdn/fabric/ospf/validation.rs | 53 ++++++++++++++++++
proxmox-ve-config/src/sdn/mod.rs | 1 +
4 files changed, 154 insertions(+)
create mode 100644 proxmox-ve-config/src/sdn/fabric/mod.rs
create mode 100644 proxmox-ve-config/src/sdn/fabric/openfabric/validation.rs
create mode 100644 proxmox-ve-config/src/sdn/fabric/ospf/validation.rs
diff --git a/proxmox-ve-config/src/sdn/fabric/mod.rs b/proxmox-ve-config/src/sdn/fabric/mod.rs
new file mode 100644
index 000000000000..949486a86355
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/mod.rs
@@ -0,0 +1,44 @@
+pub mod openfabric;
+pub mod ospf;
+
+use openfabric::OpenFabricSectionConfig;
+use ospf::OspfSectionConfig;
+use proxmox_section_config::typed::ApiSectionDataEntry;
+use proxmox_section_config::typed::SectionConfigData;
+
+use std::ops::Deref;
+
+use serde::de::DeserializeOwned;
+
+#[derive(Debug, Clone)]
+pub struct Valid<T>(SectionConfigData<T>);
+
+impl<T> Deref for Valid<T> {
+ type Target = SectionConfigData<T>;
+
+ fn deref(&self) -> &Self::Target {
+ &self.0
+ }
+}
+
+pub trait Validate<T> {
+ fn validate(data: SectionConfigData<T>) -> Result<Valid<T>, anyhow::Error>;
+ fn validate_as_ref(data: &SectionConfigData<T>) -> Result<(), anyhow::Error>;
+}
+
+impl<T> Valid<T> {
+ pub fn into_inner(self) -> SectionConfigData<T> {
+ self.0
+ }
+}
+
+impl<T> Valid<T>
+where
+ T: ApiSectionDataEntry + DeserializeOwned + Validate<T>,
+{
+ pub fn parse_section_config(filename: &str, data: &str) -> Result<Valid<T>, anyhow::Error> {
+ let config = T::parse_section_config(filename, data)?;
+ T::validate(config)
+ }
+}
+
diff --git a/proxmox-ve-config/src/sdn/fabric/openfabric/validation.rs b/proxmox-ve-config/src/sdn/fabric/openfabric/validation.rs
new file mode 100644
index 000000000000..dfb9ee94596a
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/openfabric/validation.rs
@@ -0,0 +1,56 @@
+use anyhow::{anyhow, bail};
+use std::collections::{HashMap, HashSet};
+
+use proxmox_section_config::typed::SectionConfigData;
+
+use crate::sdn::fabric::{Valid, Validate};
+
+use super::OpenFabricSectionConfig;
+
+impl Validate<OpenFabricSectionConfig> for OpenFabricSectionConfig {
+ /// This function will validate the SectionConfigData<T> and return a Valid<SectionConfigData<T>>
+ /// The validation checks if the every node is part of an existing fabric. This is necessary as
+ /// with the current SectionConfigData format, we don't get this guarantee.
+ fn validate(
+ data: SectionConfigData<OpenFabricSectionConfig>,
+ ) -> Result<Valid<OpenFabricSectionConfig>, anyhow::Error> {
+ Self::validate_as_ref(&data)?;
+ Ok(Valid(data))
+ }
+
+ fn validate_as_ref(
+ data: &SectionConfigData<OpenFabricSectionConfig>,
+ ) -> Result<(), anyhow::Error> {
+ let mut fabrics = HashMap::new();
+ let mut nodes = Vec::new();
+
+ for (_, section) in data {
+ match section {
+ OpenFabricSectionConfig::Node(node) => {
+ nodes.push(node);
+ }
+ OpenFabricSectionConfig::Fabric(fabric) => {
+ fabrics.insert(&fabric.fabric_id, fabric);
+ }
+ }
+ }
+
+ let mut router_ids = HashSet::new();
+
+ for node in nodes {
+ let fabric = fabrics
+ .get(&node.node_id.fabric_id)
+ .ok_or_else(|| anyhow!("verification error - missing fabric configuration"))?;
+
+ if !router_ids.insert(node.router_id) {
+ bail!("verification error - duplicate router_id");
+ }
+
+ if !fabric.loopback_prefix.contains_address(&node.router_id) {
+ bail!("Loopback IP of node is not contained in Loopback IP prefix");
+ }
+ }
+
+ Ok(())
+ }
+}
diff --git a/proxmox-ve-config/src/sdn/fabric/ospf/validation.rs b/proxmox-ve-config/src/sdn/fabric/ospf/validation.rs
new file mode 100644
index 000000000000..e931ba279afa
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/ospf/validation.rs
@@ -0,0 +1,53 @@
+use anyhow::{anyhow, bail};
+use std::collections::{HashMap, HashSet};
+
+use proxmox_section_config::typed::SectionConfigData;
+
+use crate::sdn::fabric::{Valid, Validate};
+
+use super::OspfSectionConfig;
+
+impl Validate<OspfSectionConfig> for OspfSectionConfig {
+ /// This function will validate the SectionConfigData<T> and return a Valid<SectionConfigData<T>>
+ /// The validation checks if the every node is part of an existing fabric. This is necessary as
+ /// with the current SectionConfigData format, we don't get this guarantee.
+ fn validate(
+ data: SectionConfigData<OspfSectionConfig>,
+ ) -> Result<Valid<OspfSectionConfig>, anyhow::Error> {
+ Self::validate_as_ref(&data)?;
+ Ok(Valid(data))
+ }
+
+ fn validate_as_ref(data: &SectionConfigData<OspfSectionConfig>) -> Result<(), anyhow::Error> {
+ let mut fabrics = HashMap::new();
+ let mut nodes = Vec::new();
+
+ for (_, section) in data {
+ match section {
+ OspfSectionConfig::Node(node) => {
+ nodes.push(node);
+ },
+ OspfSectionConfig::Fabric(fabric) => {
+ fabrics.insert(&fabric.area, fabric);
+ }
+ }
+ }
+
+ let mut router_ids = HashSet::new();
+
+ for node in nodes {
+ let fabric = fabrics.get(&node.node_id.area)
+ .ok_or_else(|| anyhow!("verification error - missing fabric configuration"))?;
+
+ if !router_ids.insert(node.router_id) {
+ bail!("verification error - duplicate router_id");
+ }
+
+ if !fabric.loopback_prefix.contains_address(&node.router_id) {
+ bail!("Loopback IP of node is not contained in Loopback IP prefix");
+ }
+ }
+
+ Ok(())
+ }
+}
diff --git a/proxmox-ve-config/src/sdn/mod.rs b/proxmox-ve-config/src/sdn/mod.rs
index 25ed7e476b9f..515ce354f366 100644
--- a/proxmox-ve-config/src/sdn/mod.rs
+++ b/proxmox-ve-config/src/sdn/mod.rs
@@ -1,5 +1,6 @@
pub mod config;
pub mod ipam;
+pub mod fabric;
use std::{error::Error, fmt::Display, str::FromStr};
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (15 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 15/17] ve-config: add validation for section-config Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-31 13:51 ` Christoph Heiss
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 17/17] ve-config: add integrations tests Gabriel Goller
` (36 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add a FabricConfig builder which iterates through nodes and generates
the frr config for the specified current_node. This part also
distributes the fabric options on all the interfaces – e.g. the
hello-interval option on the fabric will be added to all interfaces
here.
We mainly need to add these objects to FRR:
* interfaces
We simply iterate through all configured interfaces and add them FRR
with a short config line telling the daemon to enable
openfabric/ospf on this interface.
* routers
The tell the FRR daemon to initiate the openfabric/ospf daemon on
every node.
* access-lists
We throw all the router-ips of all the other nodes in the same
fabric in access-list. This way we can simply use a route-map to
match on it.
* route-maps
We add a route-map to every fabric so that we rewrite the source
address to the current router-ip which is on the local
dummy_interface.
* ip-protocol statements
These add the route-map to the protocol and all the routes from the
protocol are going through the route-map.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-ve-config/Cargo.toml | 7 +
proxmox-ve-config/debian/control | 37 ++-
proxmox-ve-config/src/sdn/fabric/mod.rs | 416 ++++++++++++++++++++++++
3 files changed, 454 insertions(+), 6 deletions(-)
diff --git a/proxmox-ve-config/Cargo.toml b/proxmox-ve-config/Cargo.toml
index 3f7639efa153..231e237fb82f 100644
--- a/proxmox-ve-config/Cargo.toml
+++ b/proxmox-ve-config/Cargo.toml
@@ -24,3 +24,10 @@ proxmox-serde = { version = "0.1.2" }
proxmox-sys = "0.6.4"
proxmox-sortable-macro = "0.1.3"
proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
+proxmox-frr = { version = "0.1", path = "../proxmox-frr/", optional = true }
+
+[features]
+frr = ["dep:proxmox-frr" ]
+
+[dev-dependencies]
+similar-asserts = "1"
diff --git a/proxmox-ve-config/debian/control b/proxmox-ve-config/debian/control
index 60ebcbc40e1c..5556ba747b8a 100644
--- a/proxmox-ve-config/debian/control
+++ b/proxmox-ve-config/debian/control
@@ -2,22 +2,26 @@ Source: rust-proxmox-ve-config
Section: rust
Priority: optional
Build-Depends: debhelper-compat (= 13),
- dh-sequence-cargo,
- cargo:native <!nocheck>,
+ dh-sequence-cargo
+Build-Depends-Arch: cargo:native <!nocheck>,
rustc:native <!nocheck>,
libstd-rust-dev <!nocheck>,
librust-anyhow-1+default-dev <!nocheck>,
librust-log-0.4+default-dev <!nocheck>,
librust-nix-0.26+default-dev <!nocheck>,
+ librust-proxmox-network-types-0.1+default-dev <!nocheck>,
librust-proxmox-schema-4+default-dev <!nocheck>,
+ librust-proxmox-section-config-2+default-dev (>= 2.1.1-~~) <!nocheck>,
+ librust-proxmox-serde-0.1+default-dev (>= 0.1.2-~~) <!nocheck>,
librust-proxmox-sortable-macro-0.1+default-dev (>= 0.1.3-~~) <!nocheck>,
librust-proxmox-sys-0.6+default-dev (>= 0.6.4-~~) <!nocheck>,
librust-serde-1+default-dev <!nocheck>,
librust-serde-1+derive-dev <!nocheck>,
librust-serde-json-1+default-dev <!nocheck>,
librust-serde-plain-1+default-dev <!nocheck>,
- librust-serde-with-3+default-dev <!nocheck>,
- librust-thiserror-1+default-dev (>= 1.0.59-~~) <!nocheck>
+ librust-serde-with-3+default-dev (>= 3.8.1-~~) <!nocheck>,
+ librust-thiserror-2+default-dev <!nocheck>,
+ librust-tracing-0.1+default-dev <!nocheck>
Maintainer: Proxmox Support Team <support@proxmox.com>
Standards-Version: 4.7.0
Vcs-Git: git://git.proxmox.com/git/proxmox-ve-rs.git
@@ -33,15 +37,21 @@ Depends:
librust-anyhow-1+default-dev,
librust-log-0.4+default-dev,
librust-nix-0.26+default-dev,
+ librust-proxmox-network-types-0.1+default-dev,
librust-proxmox-schema-4+default-dev,
+ librust-proxmox-section-config-2+default-dev (>= 2.1.1-~~),
+ librust-proxmox-serde-0.1+default-dev (>= 0.1.2-~~),
librust-proxmox-sortable-macro-0.1+default-dev (>= 0.1.3-~~),
librust-proxmox-sys-0.6+default-dev (>= 0.6.4-~~),
librust-serde-1+default-dev,
librust-serde-1+derive-dev,
librust-serde-json-1+default-dev,
librust-serde-plain-1+default-dev,
- librust-serde-with-3+default-dev,
- librust-thiserror-1+default-dev (>= 1.0.59-~~)
+ librust-serde-with-3+default-dev (>= 3.8.1-~~),
+ librust-thiserror-2+default-dev,
+ librust-tracing-0.1+default-dev
+Suggests:
+ librust-proxmox-ve-config+frr-dev (= ${binary:Version})
Provides:
librust-proxmox-ve-config+default-dev (= ${binary:Version}),
librust-proxmox-ve-config-0-dev (= ${binary:Version}),
@@ -52,3 +62,18 @@ Provides:
librust-proxmox-ve-config-0.2.2+default-dev (= ${binary:Version})
Description: Rust crate "proxmox-ve-config" - Rust source code
Source code for Debianized Rust crate "proxmox-ve-config"
+
+Package: librust-proxmox-ve-config+frr-dev
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ librust-proxmox-ve-config-dev (= ${binary:Version}),
+ librust-proxmox-frr-0.1+default-dev
+Provides:
+ librust-proxmox-ve-config-0+frr-dev (= ${binary:Version}),
+ librust-proxmox-ve-config-0.2+frr-dev (= ${binary:Version}),
+ librust-proxmox-ve-config-0.2.2+frr-dev (= ${binary:Version})
+Description: Rust crate "proxmox-ve-config" - feature "frr"
+ This metapackage enables feature "frr" for the Rust proxmox-ve-config crate, by
+ pulling in any additional dependencies needed by that feature.
diff --git a/proxmox-ve-config/src/sdn/fabric/mod.rs b/proxmox-ve-config/src/sdn/fabric/mod.rs
index 949486a86355..5dd4866e33bb 100644
--- a/proxmox-ve-config/src/sdn/fabric/mod.rs
+++ b/proxmox-ve-config/src/sdn/fabric/mod.rs
@@ -3,12 +3,32 @@ pub mod ospf;
use openfabric::OpenFabricSectionConfig;
use ospf::OspfSectionConfig;
+use proxmox_network_types::net::Net;
use proxmox_section_config::typed::ApiSectionDataEntry;
use proxmox_section_config::typed::SectionConfigData;
+use std::net::{IpAddr, Ipv4Addr};
use std::ops::Deref;
+use std::collections::HashMap;
use serde::de::DeserializeOwned;
+use serde::{Deserialize, Serialize};
+use thiserror::Error;
+
+#[cfg(feature = "frr")]
+use {
+ anyhow::anyhow,
+ proxmox_frr::{
+ ospf::Area,
+ route_map::{
+ AccessAction, AccessList, AccessListName, AccessListRule, ProtocolRouteMap,
+ RouteMap, RouteMapName, RouteMapSet, RouteMapMatch, ProtocolType
+ },
+ FrrConfig, FrrWord, Interface, InterfaceName, Router, RouterName,
+ },
+ proxmox_network_types::hostname::Hostname,
+ std::collections::BTreeMap,
+};
#[derive(Debug, Clone)]
pub struct Valid<T>(SectionConfigData<T>);
@@ -42,3 +62,399 @@ where
}
}
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Error)]
+pub enum ConfigError {
+ #[error("node id has invalid format")]
+ InvalidNodeId,
+}
+
+#[derive(Default, Clone)]
+pub struct FabricConfig {
+ openfabric: Option<Valid<OpenFabricSectionConfig>>,
+ ospf: Option<Valid<OspfSectionConfig>>,
+}
+
+impl FabricConfig {
+ pub fn new(raw_openfabric: &str, raw_ospf: &str) -> Result<Self, anyhow::Error> {
+ let openfabric = <Valid<OpenFabricSectionConfig>>::parse_section_config(
+ "openfabric.cfg",
+ raw_openfabric,
+ )?;
+ let ospf = <Valid<OspfSectionConfig>>::parse_section_config("ospf.cfg", raw_ospf)?;
+
+ Ok(Self {
+ openfabric: Some(openfabric),
+ ospf: Some(ospf),
+ })
+ }
+
+ pub fn openfabric(&self) -> &Option<Valid<OpenFabricSectionConfig>> {
+ &self.openfabric
+ }
+ pub fn ospf(&self) -> &Option<Valid<OspfSectionConfig>> {
+ &self.ospf
+ }
+
+ pub fn with_openfabric(config: Valid<OpenFabricSectionConfig>) -> FabricConfig {
+ Self {
+ openfabric: Some(config),
+ ospf: None,
+ }
+ }
+
+ pub fn with_ospf(config: Valid<OspfSectionConfig>) -> FabricConfig {
+ Self {
+ ospf: Some(config),
+ openfabric: None,
+ }
+ }
+}
+
+pub trait FromSectionConfig
+where
+ Self: Sized + TryFrom<SectionConfigData<Self::Section>>,
+ <Self as TryFrom<SectionConfigData<Self::Section>>>::Error: std::fmt::Debug,
+{
+ type Section: ApiSectionDataEntry + DeserializeOwned;
+
+ fn from_section_config(raw: &str) -> Result<Self, anyhow::Error> {
+ let section_config_data = Self::Section::section_config()
+ .parse(Self::filename(), raw)?
+ .try_into()?;
+
+ let output = Self::try_from(section_config_data).unwrap();
+ Ok(output)
+ }
+
+ fn filename() -> String;
+}
+
+/// Builder that helps building the FrrConfig.
+#[derive(Default)]
+#[cfg(feature = "frr")]
+pub struct FrrConfigBuilder {
+ fabrics: FabricConfig,
+}
+
+#[cfg(feature = "frr")]
+impl FrrConfigBuilder {
+ /// Add fabrics to the builder
+ pub fn add_fabrics(mut self, fabric: FabricConfig) -> FrrConfigBuilder {
+ self.fabrics = fabric;
+ self
+ }
+
+ /// Build the complete [`FrrConfig`] from this builder configuration given the hostname of the
+ /// node for which we want to build the config. We also inject the common fabric-level options
+ /// into the interfaces here. (e.g. the fabric-level "hello-interval" gets added to every
+ /// interface if there isn't a more specific one.)
+ pub fn build(self, current_node: Hostname) -> Result<FrrConfig, anyhow::Error> {
+ let mut router: BTreeMap<RouterName, Router> = BTreeMap::new();
+ let mut interfaces: BTreeMap<InterfaceName, Interface> = BTreeMap::new();
+ let mut access_lists: BTreeMap<AccessListName, AccessList> = BTreeMap::new();
+ let mut routemaps: Vec<RouteMap> = Vec::new();
+ let mut protocol_routemaps: Vec<ProtocolRouteMap> = Vec::new();
+
+ if let Some(openfabric) = self.fabrics.openfabric {
+ let mut fabrics = HashMap::new();
+ let mut local_configuration = Vec::new();
+
+ for (_, section) in openfabric.iter() {
+ match section {
+ OpenFabricSectionConfig::Fabric(fabric) => {
+ fabrics.insert(fabric.fabric_id.clone(), fabric);
+ },
+ OpenFabricSectionConfig::Node(node) => {
+ if node.node_id.node == current_node {
+ local_configuration.push(node);
+ }
+ }
+ }
+ }
+
+ let mut routemap_seq = 100;
+
+ for node in local_configuration {
+ let fabric = fabrics.get(&node.node_id.fabric_id)
+ .ok_or_else(|| anyhow!("could not find fabric: {}", node.node_id.fabric_id))?;
+
+ let (router_name, router_item) = Self::build_openfabric_router(
+ &node.node_id.fabric_id,
+ &node.router_id.into(),
+ )?;
+ router.insert(router_name, router_item);
+
+ let (interface, interface_name) = Self::build_openfabric_dummy_interface(
+ &node.node_id.fabric_id,
+ node.router_id,
+ )?;
+
+ if interfaces.insert(interface_name, interface).is_some() {
+ tracing::error!(
+ "An interface with the same name as the dummy interface exists"
+ );
+ }
+
+ for interface in node.interface.iter() {
+ let (interface, interface_name) = Self::build_openfabric_interface(
+ &node.node_id.fabric_id,
+ interface,
+ fabric,
+ node.router_id,
+ )?;
+
+ if interfaces.insert(interface_name, interface).is_some() {
+ tracing::warn!(
+ "An interface cannot be in multiple openfabric fabrics"
+ );
+ }
+ }
+
+ let access_list_name = AccessListName::new(format!(
+ "openfabric_{}_ips",
+ node.node_id.fabric_id
+ ));
+
+ let rule = AccessListRule {
+ action: AccessAction::Permit,
+ network: fabric.loopback_prefix,
+ seq: None,
+ };
+
+ access_lists
+ .entry(access_list_name.clone())
+ .and_modify(|l| l.rules.push(rule.clone()))
+ .or_insert(AccessList {
+ name: access_list_name,
+ rules: vec![rule],
+ });
+
+ let routemap = Self::build_openfabric_dummy_routemap(
+ &node.node_id.fabric_id,
+ node.router_id,
+ routemap_seq
+ )?;
+
+ routemap_seq += 10;
+
+ routemaps.push(routemap);
+
+ let protocol_routemap = ProtocolRouteMap {
+ protocol: ProtocolType::OpenFabric,
+ routemap_name: RouteMapName::new("openfabric".to_owned()),
+ };
+
+ protocol_routemaps.push(protocol_routemap);
+ }
+ }
+
+ if let Some(ospf) = self.fabrics.ospf {
+ let mut fabrics = HashMap::new();
+ let mut local_configuration = Vec::new();
+
+ for (_, section) in ospf.iter() {
+ match section {
+ OspfSectionConfig::Fabric(fabric) => {
+ fabrics.insert(fabric.area.clone(), fabric);
+ },
+ OspfSectionConfig::Node(node) => {
+ if node.node_id.node == current_node {
+ local_configuration.push(node);
+ }
+ }
+ }
+ }
+
+ for node in local_configuration {
+ let fabric = fabrics.get(&node.node_id.area)
+ .ok_or_else(|| anyhow!("could not find fabric: {}", node.node_id.area))?;
+
+ let (router_name, router_item) =
+ Self::build_ospf_router(&node.node_id.area, node)?;
+ router.insert(router_name, router_item);
+
+ // Add dummy interface
+ let (interface, interface_name) =
+ Self::build_ospf_dummy_interface(&node.node_id.area)?;
+
+ if interfaces.insert(interface_name, interface).is_some() {
+ tracing::error!(
+ "An interface with the same name as the dummy interface exists"
+ );
+ }
+
+ for interface in node.interface.iter() {
+ let (interface, interface_name) = Self::build_ospf_interface(
+ &node.node_id.area,
+ interface,
+ )?;
+
+ if interfaces.insert(interface_name, interface).is_some() {
+ tracing::warn!(
+ "An interface cannot be in multiple openfabric fabrics"
+ );
+ }
+ }
+
+ let access_list_name = AccessListName::new(format!(
+ "ospf_{}_ips",
+ node.node_id.area
+ ));
+
+ let rule = AccessListRule {
+ action: AccessAction::Permit,
+ network: fabric.loopback_prefix.into(),
+ seq: None,
+ };
+
+ access_lists
+ .entry(access_list_name.clone())
+ .and_modify(|l| l.rules.push(rule.clone()))
+ .or_insert(AccessList {
+ name: access_list_name,
+ rules: vec![rule],
+ });
+
+ let routemap = Self::build_ospf_dummy_routemap(
+ &node.node_id.area,
+ node.router_id,
+ )?;
+ routemaps.push(routemap);
+
+ let protocol_routemap = ProtocolRouteMap {
+ protocol: ProtocolType::Ospf,
+ routemap_name: RouteMapName::new("ospf".to_owned()),
+ };
+
+ protocol_routemaps.push(protocol_routemap);
+ }
+ }
+
+ Ok(FrrConfig {
+ router,
+ interfaces,
+ access_lists,
+ routemaps,
+ protocol_routemaps,
+ })
+ }
+
+ fn build_ospf_router(
+ area: &ospf::Area,
+ node_config: &ospf::NodeSection,
+ ) -> Result<(RouterName, Router), anyhow::Error> {
+ let ospf_router: proxmox_frr::ospf::OspfRouter = node_config.to_owned().into();
+ let router_item = Router::Ospf(ospf_router);
+ let frr_word_id = FrrWord::new(area.to_string())?;
+ let router_name = RouterName::Ospf(proxmox_frr::ospf::OspfRouterName::from(Area::new(
+ frr_word_id,
+ )?));
+ Ok((router_name, router_item))
+ }
+
+ fn build_openfabric_router(
+ fabric_id: &openfabric::FabricId,
+ net: &Net,
+ ) -> Result<(RouterName, Router), anyhow::Error> {
+ let ofr = proxmox_frr::openfabric::OpenFabricRouter { net: net.clone() };
+ let router_item = Router::OpenFabric(ofr);
+ let frr_word_id = FrrWord::new(fabric_id.to_string())?;
+ let router_name = RouterName::OpenFabric(frr_word_id.into());
+ Ok((router_name, router_item))
+ }
+
+ fn build_ospf_interface(
+ area: &ospf::Area,
+ interface: &ospf::InterfaceProperties,
+ ) -> Result<(Interface, InterfaceName), anyhow::Error> {
+ let frr_interface: proxmox_frr::ospf::OspfInterface = interface.to_frr_interface(area)?;
+
+ let interface_name = InterfaceName::Ospf(interface.name.parse()?);
+ Ok((frr_interface.into(), interface_name))
+ }
+
+ fn build_ospf_dummy_interface(
+ fabric_id: &ospf::Area,
+ ) -> Result<(Interface, InterfaceName), anyhow::Error> {
+ let frr_word = FrrWord::new(fabric_id.to_string())?;
+ let frr_interface = proxmox_frr::ospf::OspfInterface {
+ area: frr_word.try_into()?,
+ passive: Some(true),
+ network_type: None,
+ };
+ let interface_name = InterfaceName::OpenFabric(format!("dummy_{}", fabric_id).parse()?);
+ Ok((frr_interface.into(), interface_name))
+ }
+
+ fn build_openfabric_interface(
+ fabric_id: &openfabric::FabricId,
+ interface: &openfabric::InterfaceProperties,
+ fabric_config: &openfabric::FabricSection,
+ router_id: IpAddr,
+ ) -> Result<(Interface, InterfaceName), anyhow::Error> {
+ let mut frr_interface: proxmox_frr::openfabric::OpenFabricInterface =
+ interface.to_frr_interface(fabric_id, router_id.is_ipv6())?;
+ // If no specific hello_interval is set, get default one from fabric
+ // config
+ if frr_interface.hello_interval().is_none() {
+ frr_interface.set_hello_interval(fabric_config.hello_interval);
+ }
+ let interface_name = InterfaceName::OpenFabric(interface.name.parse()?);
+ Ok((frr_interface.into(), interface_name))
+ }
+
+ fn build_openfabric_dummy_interface(
+ fabric_id: &openfabric::FabricId,
+ router_id: IpAddr,
+ ) -> Result<(Interface, InterfaceName), anyhow::Error> {
+ let frr_word = FrrWord::new(fabric_id.to_string())?;
+ let frr_interface = proxmox_frr::openfabric::OpenFabricInterface {
+ fabric_id: frr_word.into(),
+ hello_interval: None,
+ passive: Some(true),
+ csnp_interval: None,
+ hello_multiplier: None,
+ is_ipv6: router_id.is_ipv6(),
+ };
+ let interface_name = InterfaceName::OpenFabric(format!("dummy_{}", fabric_id).parse()?);
+ Ok((frr_interface.into(), interface_name))
+ }
+
+ fn build_openfabric_dummy_routemap(
+ fabric_id: &openfabric::FabricId,
+ router_ip: IpAddr,
+ seq: u32
+ ) -> Result<RouteMap, anyhow::Error> {
+ let routemap_name = RouteMapName::new("openfabric".to_owned());
+ // create route-map
+ let routemap = RouteMap {
+ name: routemap_name.clone(),
+ seq,
+ action: AccessAction::Permit,
+ matches: vec![RouteMapMatch::IpAddress(AccessListName::new(format!(
+ "openfabric_{fabric_id}_ips"
+ )))],
+ sets: vec![RouteMapSet::IpSrc(router_ip)],
+ };
+ Ok(routemap)
+ }
+
+ fn build_ospf_dummy_routemap(
+ area: &ospf::Area,
+ router_ip: Ipv4Addr,
+ ) -> Result<RouteMap, anyhow::Error> {
+ let routemap_name = RouteMapName::new("ospf".to_owned());
+ // create route-map
+ let routemap = RouteMap {
+ name: routemap_name.clone(),
+ seq: 10,
+ action: AccessAction::Permit,
+ matches: vec![RouteMapMatch::IpAddress(AccessListName::new(format!(
+ "ospf_{area}_ips"
+ )))],
+ sets: vec![RouteMapSet::IpSrc(IpAddr::from(router_ip))],
+ };
+
+ Ok(routemap)
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion Gabriel Goller
@ 2025-03-31 13:51 ` Christoph Heiss
2025-03-31 14:31 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Christoph Heiss @ 2025-03-31 13:51 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox VE development discussion
On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
> [..]
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> proxmox-ve-config/Cargo.toml | 7 +
> proxmox-ve-config/debian/control | 37 ++-
> proxmox-ve-config/src/sdn/fabric/mod.rs | 416 ++++++++++++++++++++++++
> 3 files changed, 454 insertions(+), 6 deletions(-)
>
> diff --git a/proxmox-ve-config/Cargo.toml b/proxmox-ve-config/Cargo.toml
> index 3f7639efa153..231e237fb82f 100644
> --- a/proxmox-ve-config/Cargo.toml
> +++ b/proxmox-ve-config/Cargo.toml
> @@ -24,3 +24,10 @@ proxmox-serde = { version = "0.1.2" }
> proxmox-sys = "0.6.4"
> proxmox-sortable-macro = "0.1.3"
> proxmox-network-types = { version = "0.1", path = "../proxmox-network-types/" }
> +proxmox-frr = { version = "0.1", path = "../proxmox-frr/", optional = true }
> +
> +[features]
> +frr = ["dep:proxmox-frr" ]
> +
> +[dev-dependencies]
> +similar-asserts = "1"
The (new) dependency on librust-similar-asserts-dev is missing in
debian/control, just noticed while trying to build the package :^)
Didn't review further (yet).
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion
2025-03-31 13:51 ` Christoph Heiss
@ 2025-03-31 14:31 ` Stefan Hanreich
0 siblings, 0 replies; 97+ messages in thread
From: Stefan Hanreich @ 2025-03-31 14:31 UTC (permalink / raw)
To: Proxmox VE development discussion, Christoph Heiss, Gabriel Goller
On 3/31/25 15:51, Christoph Heiss wrote:
> The (new) dependency on librust-similar-asserts-dev is missing in
> debian/control, just noticed while trying to build the package :^)
>
> Didn't review further (yet).
Interesting, I just rechecked my sbuild log and seems like it worked
there because cargo insta pulled in similar-asserts...
we already got some fixes for build / test stuff that slipped through
lined up in a v2, will include this as well.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH proxmox-ve-rs 17/17] ve-config: add integrations tests
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (16 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-firewall 1/1] firewall: nftables: migrate to proxmox-network-types Gabriel Goller
` (35 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add integration tests for the full cycle from section-config to FRR
config file for both openfabric and ospf.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-ve-config/tests/fabric/helper.rs | 44 ++++++++++
proxmox-ve-config/tests/fabric/main.rs | 80 +++++++++++++++++++
.../resources/cfg/openfabric_default.cfg | 17 ++++
.../cfg/openfabric_verification_fail.cfg | 11 +++
.../fabric/resources/cfg/ospf_default.cfg | 10 +++
.../resources/cfg/ospf_verification_fail.cfg | 11 +++
.../resources/frr/openfabric_default.pve.frr | 32 ++++++++
.../resources/frr/openfabric_default.pve1.frr | 28 +++++++
.../fabric/resources/frr/ospf_default.pve.frr | 26 ++++++
.../resources/frr/ospf_default.pve1.frr | 21 +++++
10 files changed, 280 insertions(+)
create mode 100644 proxmox-ve-config/tests/fabric/helper.rs
create mode 100644 proxmox-ve-config/tests/fabric/main.rs
create mode 100644 proxmox-ve-config/tests/fabric/resources/cfg/openfabric_default.cfg
create mode 100644 proxmox-ve-config/tests/fabric/resources/cfg/openfabric_verification_fail.cfg
create mode 100644 proxmox-ve-config/tests/fabric/resources/cfg/ospf_default.cfg
create mode 100644 proxmox-ve-config/tests/fabric/resources/cfg/ospf_verification_fail.cfg
create mode 100644 proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve.frr
create mode 100644 proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve1.frr
create mode 100644 proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve.frr
create mode 100644 proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve1.frr
diff --git a/proxmox-ve-config/tests/fabric/helper.rs b/proxmox-ve-config/tests/fabric/helper.rs
new file mode 100644
index 000000000000..3d878ac702a8
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/helper.rs
@@ -0,0 +1,44 @@
+#[allow(unused_macros)]
+macro_rules! assert_frr_config {
+ ($node:expr, $output:expr) => {{
+ fn f() {}
+ fn type_name_of<T>(_: T) -> &'static str {
+ std::any::type_name::<T>()
+ }
+ let mut name = type_name_of(f);
+
+ // Find and cut the rest of the path
+ name = match &name[..name.len() - 3].rfind(':') {
+ Some(pos) => &name[pos + 1..name.len() - 3],
+ None => &name[..name.len() - 3],
+ };
+ let real_filename = format!("tests/fabric/resources/frr/{name}.{}.frr", $node);
+ let reference = std::fs::read_to_string(real_filename).expect("cannot find reference file");
+ similar_asserts::assert_eq!(reference, $output);
+ }};
+}
+
+#[allow(unused_macros)]
+macro_rules! get_section_config {
+ () => {{
+ fn f() {}
+ fn type_name_of<T>(_: T) -> &'static str {
+ std::any::type_name::<T>()
+ }
+ let mut name = type_name_of(f);
+
+ // Find and cut the rest of the path
+ name = match &name[..name.len() - 3].rfind(':') {
+ Some(pos) => &name[pos + 1..name.len() - 3],
+ None => &name[..name.len() - 3],
+ };
+ let real_filename = format!("tests/fabric/resources/cfg/{name}.cfg");
+ std::fs::read_to_string(real_filename).expect("cannot find reference file")
+ }};
+}
+
+#[allow(unused_imports)]
+pub(crate) use assert_frr_config;
+#[allow(unused_imports)]
+pub(crate) use get_section_config;
+use proxmox_frr::{serializer::FrrConfigBlob, FrrConfig};
diff --git a/proxmox-ve-config/tests/fabric/main.rs b/proxmox-ve-config/tests/fabric/main.rs
new file mode 100644
index 000000000000..9625ae7b8360
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/main.rs
@@ -0,0 +1,80 @@
+#![cfg(feature = "frr")]
+use proxmox_frr::serializer::dump;
+use proxmox_ve_config::sdn::fabric::openfabric::OpenFabricSectionConfig;
+use proxmox_ve_config::sdn::fabric::ospf::OspfSectionConfig;
+use proxmox_ve_config::sdn::fabric::{FabricConfig, FrrConfigBuilder, Valid};
+
+mod helper;
+
+/*
+ * Use the macros helper::get_section_config!() to get the section config as a string. This uses
+ * the function name and checks for "/resources/cfg/{function name}.cfg" files.
+ * With the helper::assert_frr_config! macro (which takes the hostname for which you want to render
+ * the config and the actual output) you can check the output against the reference config, which
+ * can be found in "/resources/frr/{function name}.frr".
+ */
+
+#[test]
+fn openfabric_default() {
+ let openfabric =
+ <Valid<OpenFabricSectionConfig>>::parse_section_config("", &helper::get_section_config!())
+ .unwrap();
+
+ let config = FabricConfig::with_openfabric(openfabric);
+ let mut frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config.clone())
+ .build("pve".to_owned().into())
+ .expect("error building frr config");
+
+ let mut output = dump(&frr_config).expect("error dumping stuff");
+
+ helper::assert_frr_config!("pve", output);
+
+ frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config)
+ .build("pve1".to_owned().into())
+ .expect("error building frr config");
+
+ output = dump(&frr_config).expect("error dumping stuff");
+
+ helper::assert_frr_config!("pve1", output);
+}
+
+#[test]
+fn ospf_default() {
+ let ospf = <Valid<OspfSectionConfig>>::parse_section_config("", &helper::get_section_config!())
+ .unwrap();
+
+ let config = FabricConfig::with_ospf(ospf);
+ let mut frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config.clone())
+ .build("pve".to_owned().into())
+ .expect("error building frr config");
+
+ let mut output = dump(&frr_config).expect("error dumping stuff");
+
+ helper::assert_frr_config!("pve", output);
+
+ frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config)
+ .build("pve1".to_owned().into())
+ .expect("error building frr config");
+
+ output = dump(&frr_config).expect("error dumping stuff");
+
+ helper::assert_frr_config!("pve1", output);
+}
+
+#[test]
+fn openfabric_verification_fail() {
+ let result =
+ <Valid<OpenFabricSectionConfig>>::parse_section_config("", &helper::get_section_config!());
+ assert!(result.is_err());
+}
+
+#[test]
+fn ospf_verification_fail() {
+ let result =
+ <Valid<OspfSectionConfig>>::parse_section_config("", &helper::get_section_config!());
+ assert!(result.is_err());
+}
diff --git a/proxmox-ve-config/tests/fabric/resources/cfg/openfabric_default.cfg b/proxmox-ve-config/tests/fabric/resources/cfg/openfabric_default.cfg
new file mode 100644
index 000000000000..3300ac12a1d9
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/cfg/openfabric_default.cfg
@@ -0,0 +1,17 @@
+fabric: uwu
+ hello_interval 4
+
+node: uwu_pve
+ interface name=ens20,passive=1,hello_interval=3,hello_multiplier=50
+ interface name=ens19,passive=1,csnp_interval=100
+ router_id 192.168.2.8
+
+node: uwu_pve1
+ interface name=ens19
+ interface name=ens20
+ router_id 192.168.2.9
+
+node: uwu_pve2
+ interface name=ens19
+ interface name=ens20
+ router_id 192.168.2.10
diff --git a/proxmox-ve-config/tests/fabric/resources/cfg/openfabric_verification_fail.cfg b/proxmox-ve-config/tests/fabric/resources/cfg/openfabric_verification_fail.cfg
new file mode 100644
index 000000000000..0dd4d2199264
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/cfg/openfabric_verification_fail.cfg
@@ -0,0 +1,11 @@
+fabric: uwu
+
+node: uwu1_pve
+ interface name=ens20,passive=1,hello_interval=3,hello_multiplier=50
+ interface name=ens19,passive=1,csnp_interval=100
+ router_id 192.168.2.8
+
+node: uwu_pve1
+ interface name=ens19
+ interface name=ens20
+ router_id 192.168.2.9
diff --git a/proxmox-ve-config/tests/fabric/resources/cfg/ospf_default.cfg b/proxmox-ve-config/tests/fabric/resources/cfg/ospf_default.cfg
new file mode 100644
index 000000000000..778f04fc43fe
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/cfg/ospf_default.cfg
@@ -0,0 +1,10 @@
+fabric: 0
+
+node: 0_pve
+ interface name=ens18,passive=false
+ interface name=ens19,passive=false,unnumbered=true
+ router_id 10.10.10.1
+
+node: 0_pve1
+ interface name=ens19,passive=false
+ router_id 10.10.10.2
diff --git a/proxmox-ve-config/tests/fabric/resources/cfg/ospf_verification_fail.cfg b/proxmox-ve-config/tests/fabric/resources/cfg/ospf_verification_fail.cfg
new file mode 100644
index 000000000000..ae9ed03fdbc5
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/cfg/ospf_verification_fail.cfg
@@ -0,0 +1,11 @@
+fabric: 0
+
+node: 0_pve
+ interface name=dummy0,passive=true
+ interface name=ens18,passive=false
+ router_id 10.10.10.1
+
+node: 1_pve1
+ interface name=dummy0,passive=true
+ interface name=ens19,passive=false
+ router_id 10.10.10.2
diff --git a/proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve.frr b/proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve.frr
new file mode 100644
index 000000000000..3eda4494f91b
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve.frr
@@ -0,0 +1,32 @@
+router openfabric uwu
+ net 49.0001.1921.6800.2008.00
+exit
+!
+interface dummy_uwu
+ ip router openfabric uwu
+ openfabric passive
+exit
+!
+interface ens19
+ ip router openfabric uwu
+ openfabric passive
+ openfabric hello-interval 4
+ openfabric csnp-interval 100
+exit
+!
+interface ens20
+ ip router openfabric uwu
+ openfabric passive
+ openfabric hello-interval 3
+ openfabric hello-multiplier 50
+exit
+!
+access-list openfabric_uwu_ips permit 192.168.2.9/32
+access-list openfabric_uwu_ips permit 192.168.2.10/32
+!
+route-map openfabric_uwu permit 10
+ match ip address openfabric_uwu_ips
+ set src 192.168.2.8
+exit
+!
+ip protocol openfabric route-map openfabric_uwu
diff --git a/proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve1.frr b/proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve1.frr
new file mode 100644
index 000000000000..d291193b17b4
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/frr/openfabric_default.pve1.frr
@@ -0,0 +1,28 @@
+router openfabric uwu
+ net 49.0001.1921.6800.2009.00
+exit
+!
+interface dummy_uwu
+ ip router openfabric uwu
+ openfabric passive
+exit
+!
+interface ens19
+ ip router openfabric uwu
+ openfabric hello-interval 4
+exit
+!
+interface ens20
+ ip router openfabric uwu
+ openfabric hello-interval 4
+exit
+!
+access-list openfabric_uwu_ips permit 192.168.2.8/32
+access-list openfabric_uwu_ips permit 192.168.2.10/32
+!
+route-map openfabric_uwu permit 10
+ match ip address openfabric_uwu_ips
+ set src 192.168.2.9
+exit
+!
+ip protocol openfabric route-map openfabric_uwu
diff --git a/proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve.frr b/proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve.frr
new file mode 100644
index 000000000000..5ddb8c24be65
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve.frr
@@ -0,0 +1,26 @@
+router ospf
+ ospf router-id 10.10.10.1
+exit
+!
+interface dummy_0
+ ip ospf area 0
+ ip ospf passive
+exit
+!
+interface ens18
+ ip ospf area 0
+exit
+!
+interface ens19
+ ip ospf area 0
+ ip ospf network point-to-point
+exit
+!
+access-list ospf_0_ips permit 10.10.10.2/32
+!
+route-map ospf_0 permit 10
+ match ip address ospf_0_ips
+ set src 10.10.10.1
+exit
+!
+ip protocol ospf route-map ospf_0
diff --git a/proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve1.frr b/proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve1.frr
new file mode 100644
index 000000000000..da9cacb66b46
--- /dev/null
+++ b/proxmox-ve-config/tests/fabric/resources/frr/ospf_default.pve1.frr
@@ -0,0 +1,21 @@
+router ospf
+ ospf router-id 10.10.10.2
+exit
+!
+interface dummy_0
+ ip ospf area 0
+ ip ospf passive
+exit
+!
+interface ens19
+ ip ospf area 0
+exit
+!
+access-list ospf_0_ips permit 10.10.10.1/32
+!
+route-map ospf_0 permit 10
+ match ip address ospf_0_ips
+ set src 10.10.10.2
+exit
+!
+ip protocol ospf route-map ospf_0
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-firewall 1/1] firewall: nftables: migrate to proxmox-network-types
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (17 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 17/17] ve-config: add integrations tests Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 1/7] perl-rs: sdn: initial fabric infrastructure Gabriel Goller
` (34 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
The fabrics patch series moved some generic network types into its own
crate, so they can be reused across crates. Migrate proxmox-firewall
to use the new proxmox-network-types crate instead of
proxmox_ve_config.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
Cargo.toml | 1 +
proxmox-firewall/Cargo.toml | 1 +
proxmox-firewall/src/firewall.rs | 2 +-
proxmox-firewall/src/object.rs | 4 +++-
proxmox-firewall/src/rule.rs | 3 ++-
proxmox-nftables/Cargo.toml | 3 ++-
proxmox-nftables/src/expression.rs | 5 +----
proxmox-nftables/src/types.rs | 2 +-
8 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 079fb79ee45b..7e1ebb60e536 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,3 +7,4 @@ resolver = "2"
[workspace.dependencies]
proxmox-ve-config = { version = "0.2.2" }
+proxmox-network-types = { version = "0.1" }
diff --git a/proxmox-firewall/Cargo.toml b/proxmox-firewall/Cargo.toml
index 09ea3fe3826a..67622d227d1c 100644
--- a/proxmox-firewall/Cargo.toml
+++ b/proxmox-firewall/Cargo.toml
@@ -22,6 +22,7 @@ signal-hook = "0.3"
proxmox-nftables = { path = "../proxmox-nftables", features = ["config-ext"] }
proxmox-ve-config = { workspace = true }
+proxmox-network-types = { workspace = true }
[dev-dependencies]
insta = { version = "1.21", features = ["json"] }
diff --git a/proxmox-firewall/src/firewall.rs b/proxmox-firewall/src/firewall.rs
index 607fc753b4ac..bec1fada7746 100644
--- a/proxmox-firewall/src/firewall.rs
+++ b/proxmox-firewall/src/firewall.rs
@@ -20,7 +20,7 @@ use proxmox_ve_config::firewall::ct_helper::get_cthelper;
use proxmox_ve_config::firewall::guest::Config as GuestConfig;
use proxmox_ve_config::firewall::host::Config as HostConfig;
-use proxmox_ve_config::firewall::types::address::Ipv6Cidr;
+use proxmox_network_types::address::Ipv6Cidr;
use proxmox_ve_config::firewall::types::ipset::{
Ipfilter, Ipset, IpsetEntry, IpsetName, IpsetScope,
};
diff --git a/proxmox-firewall/src/object.rs b/proxmox-firewall/src/object.rs
index cf7e773b76a8..db7b1bb7a6e0 100644
--- a/proxmox-firewall/src/object.rs
+++ b/proxmox-firewall/src/object.rs
@@ -11,11 +11,13 @@ use proxmox_nftables::{
use proxmox_ve_config::{
firewall::{
ct_helper::CtHelperMacro,
- types::{address::Family, alias::AliasName, ipset::IpsetAddress, Alias, Ipset},
+ types::{alias::AliasName, ipset::IpsetAddress, Alias, Ipset},
},
guest::types::Vmid,
};
+use proxmox_network_types::address::Family;
+
use crate::config::FirewallConfig;
pub(crate) struct NftObjectEnv<'a, 'b> {
diff --git a/proxmox-firewall/src/rule.rs b/proxmox-firewall/src/rule.rs
index 14ee54471ee4..a0597c0c2aa3 100644
--- a/proxmox-firewall/src/rule.rs
+++ b/proxmox-firewall/src/rule.rs
@@ -12,7 +12,6 @@ use proxmox_ve_config::{
ct_helper::CtHelperMacro,
fw_macros::{get_macro, FwMacro},
types::{
- address::Family,
alias::AliasName,
ipset::{Ipfilter, IpsetName},
log::LogRateLimit,
@@ -26,6 +25,8 @@ use proxmox_ve_config::{
guest::types::Vmid,
};
+use proxmox_network_types::address::Family;
+
use crate::config::FirewallConfig;
#[derive(Debug, Clone)]
diff --git a/proxmox-nftables/Cargo.toml b/proxmox-nftables/Cargo.toml
index 4ff6f41a97da..85f07f064011 100644
--- a/proxmox-nftables/Cargo.toml
+++ b/proxmox-nftables/Cargo.toml
@@ -11,7 +11,7 @@ description = "Proxmox VE nftables"
license = "AGPL-3"
[features]
-config-ext = ["dep:proxmox-ve-config"]
+config-ext = ["dep:proxmox-ve-config", "dep:proxmox-network-types"]
[dependencies]
log = "0.4"
@@ -23,3 +23,4 @@ serde_json = "1"
serde_plain = "1"
proxmox-ve-config = { workspace = true, optional = true }
+proxmox-network-types = { workspace = true, optional = true }
diff --git a/proxmox-nftables/src/expression.rs b/proxmox-nftables/src/expression.rs
index e9ef94f65947..e81076cb76e4 100644
--- a/proxmox-nftables/src/expression.rs
+++ b/proxmox-nftables/src/expression.rs
@@ -1,17 +1,14 @@
use crate::types::{ElemConfig, Verdict};
-use proxmox_ve_config::firewall::types::address::IpRange;
use proxmox_ve_config::host::types::BridgeName;
use serde::{Deserialize, Serialize};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
-#[cfg(feature = "config-ext")]
-use proxmox_ve_config::firewall::types::address::{Family, IpEntry, IpList};
#[cfg(feature = "config-ext")]
use proxmox_ve_config::firewall::types::port::{PortEntry, PortList};
#[cfg(feature = "config-ext")]
use proxmox_ve_config::firewall::types::rule_match::{IcmpCode, IcmpType, Icmpv6Code, Icmpv6Type};
#[cfg(feature = "config-ext")]
-use proxmox_ve_config::firewall::types::Cidr;
+use proxmox_network_types::address::{Cidr, IpRange, Family, IpEntry, IpList};
#[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(rename_all = "lowercase")]
diff --git a/proxmox-nftables/src/types.rs b/proxmox-nftables/src/types.rs
index 320c757c7cba..b7d4c5b0d978 100644
--- a/proxmox-nftables/src/types.rs
+++ b/proxmox-nftables/src/types.rs
@@ -8,7 +8,7 @@ use crate::{Expression, Statement};
use serde::{Deserialize, Serialize};
#[cfg(feature = "config-ext")]
-use proxmox_ve_config::firewall::types::address::Family;
+use proxmox_network_types::address::Family;
#[cfg(feature = "config-ext")]
use proxmox_ve_config::firewall::types::ipset::IpsetName;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 1/7] perl-rs: sdn: initial fabric infrastructure
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (18 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-firewall 1/1] firewall: nftables: migrate to proxmox-network-types Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 2/7] perl-rs: sdn: add CRUD helpers for OpenFabric fabric management Gabriel Goller
` (33 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add SDN fabric support with OpenFabric and OSPF configuration parsing.
Implements PerlSectionConfig wrapper and Perl module exports for fabric
configuration management.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pve-rs/Cargo.toml | 6 ++++-
pve-rs/Makefile | 1 +
pve-rs/src/lib.rs | 1 +
pve-rs/src/sdn/fabrics.rs | 50 +++++++++++++++++++++++++++++++++++++++
pve-rs/src/sdn/mod.rs | 1 +
5 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644 pve-rs/src/sdn/fabrics.rs
create mode 100644 pve-rs/src/sdn/mod.rs
diff --git a/pve-rs/Cargo.toml b/pve-rs/Cargo.toml
index f2e495d33743..441b417a961a 100644
--- a/pve-rs/Cargo.toml
+++ b/pve-rs/Cargo.toml
@@ -39,9 +39,13 @@ proxmox-log = "0.2"
proxmox-notify = { version = "0.5", features = ["pve-context"] }
proxmox-openid = "0.10"
proxmox-resource-scheduling = "0.3.0"
+proxmox-schema = "4.0.0"
+proxmox-section-config = "2.1.1"
proxmox-shared-cache = "0.1.0"
proxmox-subscription = "0.5"
proxmox-sys = "0.6"
proxmox-tfa = { version = "5", features = ["api"] }
proxmox-time = "2"
-proxmox-ve-config = { version = "0.2.1" }
+proxmox-ve-config = { version = "0.2.1", features=["frr"] }
+proxmox-frr = { version = "0.1" }
+proxmox-network-types = { version = "0.1" }
diff --git a/pve-rs/Makefile b/pve-rs/Makefile
index d01da692d8c9..86af16eb5e04 100644
--- a/pve-rs/Makefile
+++ b/pve-rs/Makefile
@@ -31,6 +31,7 @@ PERLMOD_PACKAGES := \
PVE::RS::Firewall::SDN \
PVE::RS::OpenId \
PVE::RS::ResourceScheduling::Static \
+ PVE::RS::SDN::Fabrics \
PVE::RS::TFA
PERLMOD_PACKAGE_FILES := $(addsuffix .pm,$(subst ::,/,$(PERLMOD_PACKAGES)))
diff --git a/pve-rs/src/lib.rs b/pve-rs/src/lib.rs
index 3de37d17fab6..12ee87a91cc6 100644
--- a/pve-rs/src/lib.rs
+++ b/pve-rs/src/lib.rs
@@ -15,6 +15,7 @@ pub mod apt;
pub mod firewall;
pub mod openid;
pub mod resource_scheduling;
+pub mod sdn;
pub mod tfa;
#[perlmod::package(name = "Proxmox::Lib::PVE", lib = "pve_rs")]
diff --git a/pve-rs/src/sdn/fabrics.rs b/pve-rs/src/sdn/fabrics.rs
new file mode 100644
index 000000000000..a761cea36ec0
--- /dev/null
+++ b/pve-rs/src/sdn/fabrics.rs
@@ -0,0 +1,50 @@
+#[perlmod::package(name = "PVE::RS::SDN::Fabrics", lib = "pve_rs")]
+pub mod export {
+ use std::sync::Mutex;
+
+ use anyhow::Error;
+ use proxmox_section_config::{
+ typed::ApiSectionDataEntry, typed::SectionConfigData as TypedSectionConfigData,
+ };
+ use proxmox_ve_config::sdn::fabric::{
+ openfabric::OpenFabricSectionConfig, ospf::OspfSectionConfig,
+ };
+ use serde::{Deserialize, Serialize};
+
+ pub struct PerlSectionConfig<T> {
+ pub section_config: Mutex<TypedSectionConfigData<T>>,
+ }
+
+ impl<T> PerlSectionConfig<T>
+ where
+ T: Send + Sync + Clone,
+ {
+ pub fn into_inner(self) -> Result<TypedSectionConfigData<T>, anyhow::Error> {
+ let value = self.section_config.into_inner().unwrap();
+ Ok(value)
+ }
+ }
+
+ #[derive(Serialize, Deserialize)]
+ struct AllConfigs {
+ openfabric: Vec<OpenFabricSectionConfig>,
+ ospf: Vec<OspfSectionConfig>,
+ }
+
+ /// Get all the config. This takes the raw openfabric and ospf config, parses, and returns
+ /// both.
+ #[export]
+ fn config(raw_openfabric: &[u8], raw_ospf: &[u8]) -> Result<AllConfigs, Error> {
+ let raw_openfabric = std::str::from_utf8(raw_openfabric)?;
+ let raw_ospf = std::str::from_utf8(raw_ospf)?;
+
+ let openfabric =
+ OpenFabricSectionConfig::parse_section_config("openfabric.cfg", raw_openfabric)?;
+ let ospf = OspfSectionConfig::parse_section_config("ospf.cfg", raw_ospf)?;
+
+ Ok(AllConfigs {
+ openfabric: openfabric.into_iter().map(|e| e.1).collect(),
+ ospf: ospf.into_iter().map(|e| e.1).collect(),
+ })
+ }
+}
diff --git a/pve-rs/src/sdn/mod.rs b/pve-rs/src/sdn/mod.rs
new file mode 100644
index 000000000000..3e3b1376f8d6
--- /dev/null
+++ b/pve-rs/src/sdn/mod.rs
@@ -0,0 +1 @@
+pub mod fabrics;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 2/7] perl-rs: sdn: add CRUD helpers for OpenFabric fabric management
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (19 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 1/7] perl-rs: sdn: initial fabric infrastructure Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 3/7] perl-rs: sdn: OpenFabric perlmod methods Gabriel Goller
` (32 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add functionality for managing OpenFabric fabrics:
- Implement Rust-backed Perl module PVE::RS::SDN::Fabrics::OpenFabric
- Add CRUD methods for fabric, node, and interface configuration
- Support fabric-specific parameters (hello-intervals, router-id, etc.)
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pve-rs/Makefile | 1 +
pve-rs/src/sdn/mod.rs | 1 +
pve-rs/src/sdn/openfabric.rs | 224 +++++++++++++++++++++++++++++++++++
3 files changed, 226 insertions(+)
create mode 100644 pve-rs/src/sdn/openfabric.rs
diff --git a/pve-rs/Makefile b/pve-rs/Makefile
index 86af16eb5e04..6bd9c8a2acec 100644
--- a/pve-rs/Makefile
+++ b/pve-rs/Makefile
@@ -32,6 +32,7 @@ PERLMOD_PACKAGES := \
PVE::RS::OpenId \
PVE::RS::ResourceScheduling::Static \
PVE::RS::SDN::Fabrics \
+ PVE::RS::SDN::Fabrics::OpenFabric \
PVE::RS::TFA
PERLMOD_PACKAGE_FILES := $(addsuffix .pm,$(subst ::,/,$(PERLMOD_PACKAGES)))
diff --git a/pve-rs/src/sdn/mod.rs b/pve-rs/src/sdn/mod.rs
index 3e3b1376f8d6..36afb099ece0 100644
--- a/pve-rs/src/sdn/mod.rs
+++ b/pve-rs/src/sdn/mod.rs
@@ -1 +1,2 @@
pub mod fabrics;
+pub mod openfabric;
diff --git a/pve-rs/src/sdn/openfabric.rs b/pve-rs/src/sdn/openfabric.rs
new file mode 100644
index 000000000000..65d92d313b2a
--- /dev/null
+++ b/pve-rs/src/sdn/openfabric.rs
@@ -0,0 +1,224 @@
+#[perlmod::package(name = "PVE::RS::SDN::Fabrics::OpenFabric", lib = "pve_rs")]
+mod export {
+ use std::{collections::HashMap, fmt::Write, net::IpAddr, str, sync::Mutex};
+
+ use anyhow::{Context, Error};
+ use perlmod::Value;
+ use proxmox_frr::serializer::to_raw_config;
+ use proxmox_network_types::{
+ address::Cidr,
+ hostname::Hostname,
+ openfabric::{CsnpInterval, HelloInterval, HelloMultiplier},
+ };
+ use proxmox_schema::property_string::PropertyString;
+ use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
+ use proxmox_ve_config::sdn::fabric::{
+ FabricConfig, FrrConfigBuilder, Valid, Validate,
+ openfabric::{
+ FabricId, FabricSection, InterfaceProperties, NodeId, NodeSection,
+ OpenFabricSectionConfig,
+ },
+ };
+ use serde::{Deserialize, Serialize};
+
+ use crate::sdn::fabrics::export::PerlSectionConfig;
+
+ perlmod::declare_magic!(Box<PerlSectionConfig<OpenFabricSectionConfig>> : &PerlSectionConfig<OpenFabricSectionConfig> as "PVE::RS::SDN::Fabrics::OpenFabric");
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct AddFabric {
+ fabric_id: FabricId,
+ hello_interval: Option<HelloInterval>,
+ loopback_prefix: Cidr,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct DeleteFabric {
+ fabric: FabricId,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct DeleteNode {
+ fabric: FabricId,
+ node: Hostname,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct DeleteInterface {
+ fabric: FabricId,
+ node: Hostname,
+ /// interface name
+ name: String,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct EditFabric {
+ fabric: FabricId,
+ hello_interval: Option<HelloInterval>,
+ }
+
+ #[derive(Debug, Deserialize)]
+ pub struct AddNode {
+ fabric: FabricId,
+ node: Hostname,
+ router_id: IpAddr,
+ interfaces: Vec<PropertyString<InterfaceProperties>>,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct EditNode {
+ node: Hostname,
+ fabric: FabricId,
+ router_id: IpAddr,
+ interfaces: Vec<PropertyString<InterfaceProperties>>,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct EditInterface {
+ node: Hostname,
+ fabric: FabricId,
+ name: String,
+ passive: bool,
+ hello_interval: Option<HelloInterval>,
+ hello_multiplier: Option<HelloMultiplier>,
+ csnp_interval: Option<CsnpInterval>,
+ }
+
+ fn interface_exists(
+ config: &SectionConfigData<OpenFabricSectionConfig>,
+ interface_name: &str,
+ node_name: &str,
+ ) -> bool {
+ config.sections.iter().any(|(k, v)| {
+ if let OpenFabricSectionConfig::Node(n) = v {
+ k.parse::<NodeId>().ok().is_some_and(|id| {
+ id.node.as_ref() == node_name
+ && n.interface.iter().any(|i| i.name == interface_name)
+ })
+ } else {
+ false
+ }
+ })
+ }
+
+ impl PerlSectionConfig<OpenFabricSectionConfig> {
+ pub fn add_fabric(&self, new_config: AddFabric) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+ if config.sections.contains_key(new_config.fabric_id.as_ref()) {
+ anyhow::bail!("fabric already exists");
+ }
+ let new_fabric = OpenFabricSectionConfig::Fabric(FabricSection {
+ fabric_id: new_config.fabric_id.clone(),
+ hello_interval: new_config.hello_interval,
+ ty: String::from("fabric"),
+ loopback_prefix: new_config.loopback_prefix,
+ });
+ config
+ .sections
+ .insert(new_config.fabric_id.to_string(), new_fabric);
+
+ config.order.push(new_config.fabric_id.to_string());
+ OpenFabricSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn add_node(&self, new_config: AddNode) -> Result<(), anyhow::Error> {
+ let nodeid = NodeId::new(new_config.fabric, new_config.node);
+ let nodeid_key = nodeid.to_string();
+
+ let mut config = self.section_config.lock().unwrap();
+ if config.sections.contains_key(&nodeid_key) {
+ anyhow::bail!("node already exists");
+ }
+ if new_config
+ .interfaces
+ .iter()
+ .any(|i| interface_exists(&config, &i.name, nodeid.node.as_ref()))
+ {
+ anyhow::bail!("One interface cannot be a part of two fabrics");
+ }
+ let new_fabric = OpenFabricSectionConfig::Node(NodeSection {
+ router_id: new_config.router_id,
+ interface: new_config.interfaces,
+ node_id: nodeid,
+ ty: String::from("node"),
+ });
+ config.sections.insert(nodeid_key.clone(), new_fabric);
+ config.order.push(nodeid_key);
+ OpenFabricSectionConfig::validate_as_ref(&config)?;
+
+ Ok(())
+ }
+
+ pub fn edit_fabric(&self, new_config: EditFabric) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+
+ let fabricid = new_config.fabric;
+
+ if let OpenFabricSectionConfig::Fabric(fs) = config
+ .sections
+ .get_mut(fabricid.as_ref())
+ .context("fabric doesn't exist")?
+ {
+ fs.hello_interval = new_config.hello_interval;
+ }
+ OpenFabricSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn edit_node(&self, new_config: EditNode) -> Result<(), anyhow::Error> {
+ let router_id = new_config.router_id;
+
+ let nodeid = NodeId::new(new_config.fabric, new_config.node).to_string();
+
+ let mut config = self.section_config.lock().unwrap();
+ if let Some(node) = config.sections.get_mut(&nodeid) {
+ if let OpenFabricSectionConfig::Node(n) = node {
+ n.router_id = router_id;
+ n.interface = new_config.interfaces;
+ }
+ } else {
+ anyhow::bail!("node not found");
+ }
+
+ OpenFabricSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn delete_fabric(&self, new_config: DeleteFabric) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+
+ let fabricid = new_config.fabric;
+
+ config
+ .sections
+ .remove(fabricid.as_ref())
+ .ok_or(anyhow::anyhow!("fabric not found"))?;
+ // remove all the nodes
+ config.sections.retain(|k, _v| {
+ if let Ok(nodeid) = k.parse::<NodeId>() {
+ return nodeid.fabric_id != fabricid;
+ }
+ true
+ });
+ OpenFabricSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn delete_node(&self, new_config: DeleteNode) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+ let nodeid = NodeId::new(new_config.fabric, new_config.node).to_string();
+ config
+ .sections
+ .remove(&nodeid)
+ .ok_or(anyhow::anyhow!("node not found"))?;
+ OpenFabricSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn write(&self) -> Result<String, anyhow::Error> {
+ let guard = self.section_config.lock().unwrap().clone();
+ OpenFabricSectionConfig::write_section_config("sdn/fabrics/openfabric.cfg", &guard)
+ }
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 3/7] perl-rs: sdn: OpenFabric perlmod methods
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (20 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 2/7] perl-rs: sdn: add CRUD helpers for OpenFabric fabric management Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 4/7] perl-rs: sdn: implement OSPF interface file configuration generation Gabriel Goller
` (31 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add perlmod methods that call the previously introduced CRUD helpers.
Also add a method that returns the FRR daemons to be enabled by
pve-network and a method to validate and generate the FRR config.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
pve-rs/src/sdn/openfabric.rs | 166 +++++++++++++++++++++++++++++++++++
1 file changed, 166 insertions(+)
diff --git a/pve-rs/src/sdn/openfabric.rs b/pve-rs/src/sdn/openfabric.rs
index 65d92d313b2a..680b3d081e47 100644
--- a/pve-rs/src/sdn/openfabric.rs
+++ b/pve-rs/src/sdn/openfabric.rs
@@ -221,4 +221,170 @@ mod export {
OpenFabricSectionConfig::write_section_config("sdn/fabrics/openfabric.cfg", &guard)
}
}
+
+ #[export(raw_return)]
+ fn running_config(
+ #[raw] class: Value,
+ raw_config: HashMap<String, OpenFabricSectionConfig>,
+ ) -> Result<perlmod::Value, anyhow::Error> {
+ // we cannot just construct it from the HashMap via From, since then the order is empty
+ let section_config = raw_config.into_iter().collect();
+
+ let return_value = PerlSectionConfig {
+ section_config: Mutex::new(section_config),
+ };
+
+ Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new(
+ return_value
+ )))
+ }
+
+ #[export(raw_return)]
+ fn config(#[raw] class: Value, raw_config: &[u8]) -> Result<perlmod::Value, anyhow::Error> {
+ let raw_config = std::str::from_utf8(raw_config)?;
+
+ let config = OpenFabricSectionConfig::parse_section_config("openfabric.cfg", raw_config)?;
+ let return_value = PerlSectionConfig {
+ section_config: Mutex::new(config),
+ };
+
+ Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new(
+ return_value
+ )))
+ }
+
+ /// Writes the config to a string and returns the configuration and the protocol.
+ #[export]
+ fn write(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ ) -> Result<(String, String), Error> {
+ let full_new_config = this.write()?;
+
+ // We return the protocol here as well, so that in perl we can write to
+ // the correct config file
+ Ok((full_new_config, "openfabric".to_string()))
+ }
+
+ #[export]
+ fn add_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ new_config: AddFabric,
+ ) -> Result<(), Error> {
+ this.add_fabric(new_config)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn add_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ new_config: AddNode,
+ ) -> Result<(), Error> {
+ this.add_node(new_config)
+ }
+
+ #[export]
+ fn edit_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ new_config: EditFabric,
+ ) -> Result<(), Error> {
+ this.edit_fabric(new_config)
+ }
+
+ #[export]
+ fn edit_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ new_config: EditNode,
+ ) -> Result<(), Error> {
+ this.edit_node(new_config)
+ }
+
+ #[export]
+ fn delete_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ delete_config: DeleteFabric,
+ ) -> Result<(), Error> {
+ this.delete_fabric(delete_config)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn delete_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ delete_config: DeleteNode,
+ ) -> Result<(), Error> {
+ this.delete_node(delete_config)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn get_inner(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ ) -> HashMap<String, OpenFabricSectionConfig> {
+ let guard = this.section_config.lock().unwrap();
+ guard.clone().into_iter().collect()
+ }
+
+ #[export]
+ fn get_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ fabric: FabricId,
+ ) -> Result<OpenFabricSectionConfig, Error> {
+ let guard = this.section_config.lock().unwrap();
+ guard
+ .get(fabric.as_ref())
+ .cloned()
+ .ok_or(anyhow::anyhow!("fabric not found"))
+ }
+
+ #[export]
+ fn get_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ fabric: FabricId,
+ node: Hostname,
+ ) -> Result<OpenFabricSectionConfig, Error> {
+ let guard = this.section_config.lock().unwrap();
+ let nodeid = NodeId::new(fabric, node).to_string();
+ guard
+ .get(&nodeid)
+ .cloned()
+ .ok_or(anyhow::anyhow!("node not found"))
+ }
+
+ #[export]
+ pub fn enabled_daemons(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ host_name: Hostname,
+ ) -> Vec<String> {
+ let config = this.section_config.lock().unwrap();
+
+ for (_, section) in config.iter() {
+ if let OpenFabricSectionConfig::Node(node) = section {
+ if node.node_id.node == host_name {
+ return vec!["fabricd".to_string()];
+ }
+ }
+ }
+
+ Vec::new()
+ }
+
+ #[export]
+ pub fn get_frr_raw_config(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ node: Hostname,
+ ) -> Result<Vec<String>, Error> {
+ let config = this.section_config.lock().unwrap();
+ let openfabric_config: Valid<OpenFabricSectionConfig> =
+ OpenFabricSectionConfig::validate(config.clone())?;
+
+ let config = FabricConfig::with_openfabric(openfabric_config);
+ let frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config)
+ .build(node)?;
+
+ to_raw_config(&frr_config)
+ }
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 4/7] perl-rs: sdn: implement OSPF interface file configuration generation
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (21 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 3/7] perl-rs: sdn: OpenFabric perlmod methods Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 5/7] perl-rs: sdn: add CRUD helpers for OSPF fabric management Gabriel Goller
` (30 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add function to generate /etc/network/interfaces configuration for OpenFabric nodes:
- Auto-create dummy interfaces with proper router-id
- Configure interface addresses and IP forwarding
- Support for both IPv4 and IPv6 addressing on both dummy and other
interfaces
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pve-rs/src/sdn/openfabric.rs | 72 ++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/pve-rs/src/sdn/openfabric.rs b/pve-rs/src/sdn/openfabric.rs
index 680b3d081e47..2d21e6dae5e1 100644
--- a/pve-rs/src/sdn/openfabric.rs
+++ b/pve-rs/src/sdn/openfabric.rs
@@ -353,6 +353,78 @@ mod export {
.ok_or(anyhow::anyhow!("node not found"))
}
+ #[export]
+ fn get_interfaces_etc_network_config(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ node: Hostname,
+ ) -> Result<String, Error> {
+ let guard = this.section_config.lock().unwrap();
+ let mut interfaces = String::new();
+
+ guard.iter().try_for_each(|section| {
+ if let OpenFabricSectionConfig::Node(node_section) = section.1 {
+ if node_section.node_id.node == node {
+ // create dummy interface for this fabric
+ writeln!(interfaces)?;
+ writeln!(interfaces, "auto dummy_{}", node_section.node_id.fabric_id)?;
+ match node_section.router_id {
+ IpAddr::V4(_) => writeln!(
+ interfaces,
+ "iface dummy_{} inet static",
+ node_section.node_id.fabric_id
+ )?,
+ IpAddr::V6(_) => writeln!(
+ interfaces,
+ "iface dummy_{} inet6 static",
+ node_section.node_id.fabric_id
+ )?,
+ }
+ writeln!(interfaces, "\tlink-type dummy")?;
+ writeln!(interfaces, "\tip-forward 1")?;
+ // add dummy interface address as /32
+ match node_section.router_id {
+ IpAddr::V4(ipv4_addr) => {
+ writeln!(interfaces, "\taddress {}/32", ipv4_addr)?
+ }
+ IpAddr::V6(ipv6_addr) => {
+ writeln!(interfaces, "\taddress {}/128", ipv6_addr)?
+ }
+ }
+
+ // add ip-addrs to all other interfaces and ensure they exist
+ // also enable ip-forwarding on all interfaces as this is needed for unnumbered
+ // peering
+ node_section
+ .clone()
+ .interface
+ .into_iter()
+ .try_for_each(|i| {
+ let interface_name = i.name.clone();
+ writeln!(interfaces)?;
+ writeln!(interfaces, "auto {interface_name}")?;
+ if let Some(ip) = i.ip.map(|i| i.to_string()) {
+ writeln!(interfaces, "iface {interface_name} inet static")?;
+ writeln!(interfaces, "\taddress {}", ip)?;
+ writeln!(interfaces, "\tip-forward 1")?;
+ }
+ if let Some(ipv6) = i.ipv6.map(|i| i.to_string()) {
+ writeln!(interfaces, "iface {interface_name} inet6 static")?;
+ writeln!(interfaces, "\taddress {ipv6}")?;
+ writeln!(interfaces, "\tip6-forward 1")?;
+ }
+ if i.ip.is_none() && i.ipv6.is_none() {
+ writeln!(interfaces, "iface {interface_name} inet manual")?;
+ writeln!(interfaces, "\tip-forward 1")?;
+ }
+ Ok::<(), std::fmt::Error>(())
+ })?;
+ }
+ }
+ Ok::<(), std::fmt::Error>(())
+ })?;
+ Ok(interfaces)
+ }
+
#[export]
pub fn enabled_daemons(
#[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 5/7] perl-rs: sdn: add CRUD helpers for OSPF fabric management
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (22 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 4/7] perl-rs: sdn: implement OSPF interface file configuration generation Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 6/7] perl-rs: sdn: OSPF perlmod methods Gabriel Goller
` (29 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add CRUD functions for managing OSPF fabrics.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pve-rs/Makefile | 1 +
pve-rs/src/sdn/mod.rs | 1 +
pve-rs/src/sdn/ospf.rs | 208 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 210 insertions(+)
create mode 100644 pve-rs/src/sdn/ospf.rs
diff --git a/pve-rs/Makefile b/pve-rs/Makefile
index 6bd9c8a2acec..5bd4d3c58b36 100644
--- a/pve-rs/Makefile
+++ b/pve-rs/Makefile
@@ -33,6 +33,7 @@ PERLMOD_PACKAGES := \
PVE::RS::ResourceScheduling::Static \
PVE::RS::SDN::Fabrics \
PVE::RS::SDN::Fabrics::OpenFabric \
+ PVE::RS::SDN::Fabrics::Ospf \
PVE::RS::TFA
PERLMOD_PACKAGE_FILES := $(addsuffix .pm,$(subst ::,/,$(PERLMOD_PACKAGES)))
diff --git a/pve-rs/src/sdn/mod.rs b/pve-rs/src/sdn/mod.rs
index 36afb099ece0..6700c989483f 100644
--- a/pve-rs/src/sdn/mod.rs
+++ b/pve-rs/src/sdn/mod.rs
@@ -1,2 +1,3 @@
pub mod fabrics;
pub mod openfabric;
+pub mod ospf;
diff --git a/pve-rs/src/sdn/ospf.rs b/pve-rs/src/sdn/ospf.rs
new file mode 100644
index 000000000000..f6aac0db83f1
--- /dev/null
+++ b/pve-rs/src/sdn/ospf.rs
@@ -0,0 +1,208 @@
+#[perlmod::package(name = "PVE::RS::SDN::Fabrics::Ospf", lib = "pve_rs")]
+mod export {
+ use std::{collections::HashMap, fmt::Write, net::Ipv4Addr, str, sync::Mutex};
+
+ use anyhow::{Context, Error};
+ use perlmod::Value;
+ use proxmox_frr::serializer::to_raw_config;
+ use proxmox_network_types::{
+ address::Ipv4Cidr,
+ hostname::Hostname,
+ };
+ use proxmox_schema::property_string::PropertyString;
+ use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
+ use proxmox_ve_config::sdn::fabric::{
+ FabricConfig, FrrConfigBuilder, Valid, Validate as _,
+ ospf::{Area, FabricSection, InterfaceProperties, NodeId, NodeSection, OspfSectionConfig},
+ };
+ use serde::{Deserialize, Serialize};
+
+ use crate::sdn::fabrics::export::PerlSectionConfig;
+
+ perlmod::declare_magic!(Box<PerlSectionConfig<OspfSectionConfig>> : &PerlSectionConfig<OspfSectionConfig> as "PVE::RS::SDN::Fabrics::Ospf");
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct AddFabric {
+ area: Area,
+ loopback_prefix: Ipv4Cidr,
+ }
+
+ #[derive(Debug, Deserialize)]
+ pub struct AddNode {
+ node: Hostname,
+ fabric: Area,
+ router_id: Ipv4Addr,
+ interfaces: Vec<PropertyString<InterfaceProperties>>,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct DeleteFabric {
+ fabric: Area,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct DeleteNode {
+ fabric: Area,
+ node: Hostname,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct DeleteInterface {
+ fabric: Area,
+ node: Hostname,
+ /// interface name
+ name: String,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct EditFabric {
+ name: String,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct EditNode {
+ fabric: Area,
+ node: Hostname,
+
+ router_id: Ipv4Addr,
+ interfaces: Vec<PropertyString<InterfaceProperties>>,
+ }
+
+ #[derive(Debug, Serialize, Deserialize)]
+ pub struct EditInterface {
+ fabric: Area,
+ node: Hostname,
+ name: String,
+
+ passive: bool,
+ }
+
+ fn interface_exists(
+ config: &SectionConfigData<OspfSectionConfig>,
+ interface_name: &str,
+ node_name: &str,
+ ) -> bool {
+ config.sections.iter().any(|(k, v)| {
+ if let OspfSectionConfig::Node(n) = v {
+ k.parse::<NodeId>().ok().is_some_and(|id| {
+ id.node.as_ref() == node_name
+ && n.interface.iter().any(|i| i.name == interface_name)
+ })
+ } else {
+ false
+ }
+ })
+ }
+
+ impl PerlSectionConfig<OspfSectionConfig> {
+ pub fn add_fabric(&self, new_config: AddFabric) -> Result<(), anyhow::Error> {
+ let area = new_config.area.to_string();
+ let mut config = self.section_config.lock().unwrap();
+ if config.sections.contains_key(&area) {
+ anyhow::bail!("fabric already exists");
+ }
+ let new_fabric = OspfSectionConfig::Fabric(FabricSection {
+ area: new_config.area,
+ ty: String::from("fabric"),
+ loopback_prefix: new_config.loopback_prefix,
+ });
+ config.sections.insert(area.clone(), new_fabric);
+ config.order.push(area);
+ OspfSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn add_node(&self, new_config: AddNode) -> Result<(), anyhow::Error> {
+ let nodeid = NodeId::new(new_config.fabric, new_config.node);
+ let nodeid_key = nodeid.to_string();
+ let mut config = self.section_config.lock().unwrap();
+ if config.sections.contains_key(&nodeid_key) {
+ anyhow::bail!("node already exists");
+ }
+ if new_config
+ .interfaces
+ .iter()
+ .any(|i| interface_exists(&config, &i.name, nodeid.node.as_ref()))
+ {
+ anyhow::bail!("One interface cannot be a part of two areas");
+ }
+
+ let new_fabric = OspfSectionConfig::Node(NodeSection {
+ node_id: nodeid,
+ router_id: new_config.router_id,
+ interface: new_config.interfaces,
+ ty: String::from("node"),
+ });
+ config.sections.insert(nodeid_key.clone(), new_fabric);
+ config.order.push(nodeid_key);
+ OspfSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn edit_fabric(&self, new_config: EditFabric) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+
+ if let OspfSectionConfig::Fabric(_fs) = config
+ .sections
+ .get_mut(&new_config.name)
+ .context("fabric doesn't exist")?
+ {
+ // currently no properties exist here
+ }
+ OspfSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn edit_node(&self, new_config: EditNode) -> Result<(), anyhow::Error> {
+ let nodeid = NodeId::new(new_config.fabric, new_config.node).to_string();
+
+ let mut config = self.section_config.lock().unwrap();
+ if let Some(node) = config.sections.get_mut(&nodeid) {
+ if let OspfSectionConfig::Node(n) = node {
+ n.router_id = new_config.router_id;
+ n.interface = new_config.interfaces;
+ }
+ } else {
+ anyhow::bail!("node not found");
+ }
+ OspfSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn delete_fabric(&self, new_config: DeleteFabric) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+
+ let area = new_config.fabric;
+ config
+ .sections
+ .remove(area.as_ref())
+ .ok_or(anyhow::anyhow!("no fabric found"))?;
+
+ // remove all the nodes
+ config.sections.retain(|k, _v| {
+ if let Ok(nodeid) = k.parse::<NodeId>() {
+ return nodeid.area != area;
+ }
+ true
+ });
+ OspfSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn delete_node(&self, new_config: DeleteNode) -> Result<(), anyhow::Error> {
+ let mut config = self.section_config.lock().unwrap();
+ let nodeid = NodeId::new(new_config.fabric, new_config.node).to_string();
+ config
+ .sections
+ .remove(&nodeid)
+ .ok_or(anyhow::anyhow!("node not found"))?;
+ OspfSectionConfig::validate_as_ref(&config)?;
+ Ok(())
+ }
+
+ pub fn write(&self) -> Result<String, anyhow::Error> {
+ let guard = self.section_config.lock().unwrap().clone();
+ OspfSectionConfig::write_section_config("sdn/fabrics/ospf.cfg", &guard)
+ }
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 6/7] perl-rs: sdn: OSPF perlmod methods
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (23 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 5/7] perl-rs: sdn: add CRUD helpers for OSPF fabric management Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 7/7] perl-rs: sdn: implement OSPF interface file configuration generation Gabriel Goller
` (28 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
CRUD methods for perlmod that call the helper functions defined earlier.
Also add a method that returns the FRR daemons to be enabled and a
method that generates FRR configuration after validating it.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
pve-rs/src/sdn/ospf.rs | 165 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 165 insertions(+)
diff --git a/pve-rs/src/sdn/ospf.rs b/pve-rs/src/sdn/ospf.rs
index f6aac0db83f1..63ce0d53ffb8 100644
--- a/pve-rs/src/sdn/ospf.rs
+++ b/pve-rs/src/sdn/ospf.rs
@@ -205,4 +205,169 @@ mod export {
OspfSectionConfig::write_section_config("sdn/fabrics/ospf.cfg", &guard)
}
}
+
+ #[export(raw_return)]
+ fn running_config(
+ #[raw] class: Value,
+ raw_config: HashMap<String, OspfSectionConfig>,
+ ) -> Result<perlmod::Value, anyhow::Error> {
+ // we cannot just construct it from the HashMap via From, since then the order is empty
+ let section_config = raw_config.into_iter().collect();
+
+ let return_value = PerlSectionConfig {
+ section_config: Mutex::new(section_config),
+ };
+
+ Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new(
+ return_value
+ )))
+ }
+
+ #[export(raw_return)]
+ fn config(#[raw] class: Value, raw_config: &[u8]) -> Result<perlmod::Value, anyhow::Error> {
+ let raw_config = std::str::from_utf8(raw_config)?;
+
+ let config = OspfSectionConfig::parse_section_config("ospf.cfg", raw_config)?;
+ let return_value = PerlSectionConfig {
+ section_config: Mutex::new(config),
+ };
+
+ Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new(
+ return_value
+ )))
+ }
+
+ /// Writes the config to a string and returns the configuration and the protocol.
+ #[export]
+ fn write(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ ) -> Result<(String, String), Error> {
+ let full_new_config = this.write()?;
+
+ // We return the protocol here as well, so that in perl we can write to
+ // the correct config file
+ Ok((full_new_config, "ospf".to_string()))
+ }
+
+ #[export]
+ fn add_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ new_config: AddFabric,
+ ) -> Result<(), Error> {
+ this.add_fabric(new_config)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn add_node(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ new_config: AddNode,
+ ) -> Result<(), Error> {
+ this.add_node(new_config)
+ }
+
+ #[export]
+ fn edit_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ new_config: EditFabric,
+ ) -> Result<(), Error> {
+ this.edit_fabric(new_config)
+ }
+
+ #[export]
+ fn edit_node(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ new_config: EditNode,
+ ) -> Result<(), Error> {
+ this.edit_node(new_config)
+ }
+
+ #[export]
+ fn delete_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ delete_config: DeleteFabric,
+ ) -> Result<(), Error> {
+ this.delete_fabric(delete_config)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn delete_node(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ delete_config: DeleteNode,
+ ) -> Result<(), Error> {
+ this.delete_node(delete_config)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn get_inner(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ ) -> HashMap<String, OspfSectionConfig> {
+ let guard = this.section_config.lock().unwrap();
+ guard.clone().into_iter().collect()
+ }
+
+ #[export]
+ fn get_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ fabric: Area,
+ ) -> Result<OspfSectionConfig, Error> {
+ let guard = this.section_config.lock().unwrap();
+ guard
+ .get(&fabric.to_string())
+ .cloned()
+ .ok_or(anyhow::anyhow!("fabric not found"))
+ }
+
+ #[export]
+ fn get_node(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ fabric: Area,
+ node: Hostname,
+ ) -> Result<OspfSectionConfig, Error> {
+ let guard = this.section_config.lock().unwrap();
+ let nodeid = NodeId::new(fabric, node).to_string();
+ guard
+ .get(&nodeid)
+ .cloned()
+ .ok_or(anyhow::anyhow!("node not found"))
+ }
+
+ #[export]
+ pub fn enabled_daemons(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ host_name: Hostname,
+ ) -> Vec<String> {
+ let config = this.section_config.lock().unwrap();
+
+ for (_, section) in config.iter() {
+ if let OspfSectionConfig::Node(node) = section {
+ if node.node_id.node == host_name {
+ return vec!["ospfd".to_string()];
+ }
+ }
+ }
+
+ Vec::new()
+ }
+
+ #[export]
+ pub fn get_frr_raw_config(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ node: Hostname,
+ ) -> Result<Vec<String>, Error> {
+ let config = this.section_config.lock().unwrap();
+ let ospf_config: Valid<OspfSectionConfig> = OspfSectionConfig::validate(config.clone())?;
+
+ let config = FabricConfig::with_ospf(ospf_config);
+ let frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config)
+ .build(node)?;
+
+ to_raw_config(&frr_config)
+ }
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH proxmox-perl-rs 7/7] perl-rs: sdn: implement OSPF interface file configuration generation
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (24 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 6/7] perl-rs: sdn: OSPF perlmod methods Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-cluster 1/1] cluster: add sdn fabrics config files Gabriel Goller
` (27 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add function to generate /etc/network/interfaces configuration for OSPF nodes including:
- Create dummy interfaces for each area with /32 addresses
- Configure IP addresses on physical interfaces
- Enable IP forwarding on all relevant interfaces
- Support both numbered and unnumbered interface configurations
Note that the `ospfd` daemon only supports IPv4 so we only have IPv4
addresses for OSPF. In a follow-up we could also support the `ospf6d`
daemon, which supports IPv6.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pve-rs/src/sdn/ospf.rs | 54 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
diff --git a/pve-rs/src/sdn/ospf.rs b/pve-rs/src/sdn/ospf.rs
index 63ce0d53ffb8..9f6a7302e0db 100644
--- a/pve-rs/src/sdn/ospf.rs
+++ b/pve-rs/src/sdn/ospf.rs
@@ -337,6 +337,60 @@ mod export {
.ok_or(anyhow::anyhow!("node not found"))
}
+ #[export]
+ fn get_interfaces_etc_network_config(
+ #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+ node: Hostname,
+ ) -> Result<String, Error> {
+ let guard = this.section_config.lock().unwrap();
+ let mut interfaces = String::new();
+
+ guard.iter().try_for_each(|section| {
+ if let OspfSectionConfig::Node(node_section) = section.1 {
+ if node_section.node_id.node == node {
+ // create dummy interface for this fabric
+ writeln!(interfaces)?;
+ writeln!(interfaces, "auto dummy_{}", node_section.node_id.area)?;
+ writeln!(
+ interfaces,
+ "iface dummy_{} inet static",
+ node_section.node_id.area
+ )?;
+ writeln!(interfaces, "\tlink-type dummy")?;
+ writeln!(interfaces, "\tip-forward 1")?;
+ // add dummy interface address as /32
+ writeln!(interfaces, "\taddress {}/32", node_section.router_id)?;
+
+ // add ip-addrs to all other interfaces and ensure they exist
+ // also enable ip-forwarding on all interfaces as this is needed for unnumbered
+ // peering
+ node_section
+ .clone()
+ .interface
+ .into_iter()
+ .try_for_each(|i| {
+ let interface_name = i.name.clone();
+ writeln!(interfaces)?;
+ writeln!(interfaces, "auto {interface_name}")?;
+ if let Some(ip) = i.ip.map(|i| i.to_string()) {
+ writeln!(interfaces, "iface {interface_name} inet static")?;
+ writeln!(interfaces, "\taddress {}", ip)?;
+ writeln!(interfaces, "\tip-forward 1")?;
+ } else {
+ // unnumbered interface needs ip addresses configured in ospf
+ writeln!(interfaces, "iface {interface_name} inet static")?;
+ writeln!(interfaces, "\taddress {}/32", node_section.router_id)?;
+ writeln!(interfaces, "\tip-forward 1")?;
+ }
+ Ok::<(), std::fmt::Error>(())
+ })?;
+ }
+ }
+ Ok::<(), std::fmt::Error>(())
+ })?;
+ Ok(interfaces)
+ }
+
#[export]
pub fn enabled_daemons(
#[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-cluster 1/1] cluster: add sdn fabrics config files
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (25 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 7/7] perl-rs: sdn: implement OSPF interface file configuration generation Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 01/17] sdn: fix value returned by pending_config Gabriel Goller
` (26 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add the sdn fabrics config files. These are split into two, as we
currently support two fabric types: ospf and openfabric. They hold the
whole configuration for the respective protocols. They are read and
written by pve-network.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Cluster.pm | 2 ++
src/pmxcfs/status.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/PVE/Cluster.pm b/src/PVE/Cluster.pm
index e0e3ee995085..a325b67905b8 100644
--- a/src/PVE/Cluster.pm
+++ b/src/PVE/Cluster.pm
@@ -81,6 +81,8 @@ my $observed = {
'sdn/pve-ipam-state.json' => 1,
'sdn/mac-cache.json' => 1,
'sdn/dns.cfg' => 1,
+ 'sdn/fabrics/openfabric.cfg' => 1,
+ 'sdn/fabrics/ospf.cfg' => 1,
'sdn/.running-config' => 1,
'virtual-guest/cpu-models.conf' => 1,
'virtual-guest/profiles.cfg' => 1,
diff --git a/src/pmxcfs/status.c b/src/pmxcfs/status.c
index ff5fcc4301e3..5844928d50b6 100644
--- a/src/pmxcfs/status.c
+++ b/src/pmxcfs/status.c
@@ -110,6 +110,8 @@ static memdb_change_t memdb_change_array[] = {
{ .path = "sdn/mac-cache.json" },
{ .path = "sdn/pve-ipam-state.json" },
{ .path = "sdn/dns.cfg" },
+ { .path = "sdn/fabrics/openfabric.cfg" },
+ { .path = "sdn/fabrics/ospf.cfg" },
{ .path = "sdn/.running-config" },
{ .path = "virtual-guest/cpu-models.conf" },
{ .path = "virtual-guest/profiles.cfg" },
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 01/17] sdn: fix value returned by pending_config
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (26 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-cluster 1/1] cluster: add sdn fabrics config files Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 02/17] debian: add dependency to proxmox-perl-rs Gabriel Goller
` (25 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
For special types that were encoded by the encode_value function in
sdn, we returned the encoded value in the API, rather than the actual
value. Since we use the encoded value only for comparison, we need to
return the original value instead of the encoded value.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index 68f9e0fffbfe..c9c45b1c07ea 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -123,7 +123,7 @@ sub pending_config {
if($key eq 'type' || $key eq 'vnet') {
$pending->{$id}->{$key} = $config_value;
} else {
- $pending->{$id}->{"pending"}->{$key} = $config_value if !defined($running_value) || ($config_value ne $running_value);
+ $pending->{$id}->{"pending"}->{$key} = $config_object->{$key} if !defined($running_value) || ($config_value ne $running_value);
}
if(!keys %{$running_object}) {
$pending->{$id}->{state} = "new";
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 02/17] debian: add dependency to proxmox-perl-rs
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (27 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 01/17] sdn: fix value returned by pending_config Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 03/17] fabrics: add fabrics module Gabriel Goller
` (24 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
We call perlmod rust functions directly from pve-network.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
debian/control | 2 ++
1 file changed, 2 insertions(+)
diff --git a/debian/control b/debian/control
index 34b736676766..604419d59e11 100644
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,7 @@ Build-Depends: debhelper-compat (= 13),
pve-cluster (>= 8.0.10),
pve-firewall (>= 5.1.0~),
pve-doc-generator (>= 5.3-3),
+ libpve-rs-perl,
libpve-access-control,
Standards-Version: 4.6.1
Homepage: https://www.proxmox.com
@@ -23,6 +24,7 @@ Depends: libpve-common-perl (>= 5.0-45),
libnet-subnet-perl,
libnet-ip-perl,
libnetaddr-ip-perl,
+ libpve-rs-perl,
${misc:Depends},
${perl:Depends},
Recommends: ifupdown2
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 03/17] fabrics: add fabrics module
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (28 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 02/17] debian: add dependency to proxmox-perl-rs Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 04/17] refactor: controller: move frr methods into helper Gabriel Goller
` (23 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
This module adds the basic functionality required for the sdn fabrics
feature. It includes helpers for reading and writing the configuration
files via perlmod.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN/Fabrics.pm | 83 ++++++++++++++++++++++++++++++++++
src/PVE/Network/SDN/Makefile | 2 +-
2 files changed, 84 insertions(+), 1 deletion(-)
create mode 100644 src/PVE/Network/SDN/Fabrics.pm
diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
new file mode 100644
index 000000000000..5f31fb503f48
--- /dev/null
+++ b/src/PVE/Network/SDN/Fabrics.pm
@@ -0,0 +1,83 @@
+package PVE::Network::SDN::Fabrics;
+
+use strict;
+use warnings;
+
+use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_lock_file cfs_write_file);
+use PVE::INotify;
+use PVE::RS::SDN::Fabrics;
+use PVE::RS::SDN::Fabrics::Ospf;
+use PVE::RS::SDN::Fabrics::OpenFabric;
+
+cfs_register_file(
+ 'sdn/fabrics/openfabric.cfg',
+ \&parse_fabrics_config,
+ \&write_fabrics_config,
+);
+
+cfs_register_file(
+ 'sdn/fabrics/ospf.cfg',
+ \&parse_fabrics_config,
+ \&write_fabrics_config,
+);
+
+sub parse_fabrics_config {
+ my ($filename, $raw) = @_;
+
+ $raw = '' if !defined($raw);
+ return $raw;
+}
+
+sub write_fabrics_config {
+ my ($filename, $config) = @_;
+ return $config;
+}
+
+my $FABRIC_MODULES = {
+ openfabric => "PVE::RS::SDN::Fabrics::OpenFabric",
+ ospf => "PVE::RS::SDN::Fabrics::Ospf",
+};
+
+sub config {
+ my ($running) = @_;
+
+ my $configs = {};
+
+ for my $protocol (sort keys %$FABRIC_MODULES) {
+ $configs->{$protocol} = PVE::Network::SDN::Fabrics::config_for_protocol($protocol, $running);
+ }
+
+ return $configs;
+}
+
+sub config_for_protocol {
+ my ($protocol, $running) = @_;
+
+ my $module = $FABRIC_MODULES->{$protocol};
+ die "cannot get fabric config \"$protocol\": not implemented" if !$module;
+
+ if ($running) {
+ my $running_config = PVE::Network::SDN::running_config();
+ # required because if the config hasn't been applied yet once after the
+ # introduction of fabrics then the keys do not exist in the running
+ # config so we default to an empty hash
+ my $protocol_config = $running_config->{$protocol}->{ids} // {};
+ return $module->running_config($protocol_config);
+ }
+
+ my $section_config = cfs_read_file("sdn/fabrics/$protocol.cfg");
+ return $module->config($section_config);
+}
+
+sub write_config {
+ my ($config) = @_;
+
+ my ($new_config, $protocol) = $config->write();
+
+ # It is safe to use the protocol in the path here as it comes from rust. There
+ # the protocol is stored in an enum so we know it is correct.
+ cfs_write_file("sdn/fabrics/$protocol.cfg", $new_config, 1);
+}
+
+1;
+
diff --git a/src/PVE/Network/SDN/Makefile b/src/PVE/Network/SDN/Makefile
index 3e6e5fb4c6f2..a256642e3044 100644
--- a/src/PVE/Network/SDN/Makefile
+++ b/src/PVE/Network/SDN/Makefile
@@ -1,4 +1,4 @@
-SOURCES=Vnets.pm VnetPlugin.pm Zones.pm Controllers.pm Subnets.pm SubnetPlugin.pm Ipams.pm Dns.pm Dhcp.pm
+SOURCES=Vnets.pm VnetPlugin.pm Zones.pm Controllers.pm Subnets.pm SubnetPlugin.pm Ipams.pm Dns.pm Dhcp.pm Fabrics.pm
PERL5DIR=${DESTDIR}/usr/share/perl5
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 04/17] refactor: controller: move frr methods into helper
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (29 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 03/17] fabrics: add fabrics module Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 05/17] controllers: implement new api for frr config generation Gabriel Goller
` (22 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Up until now the EVPN controller contained all the helper methods as
well as the configuration generation logic for FRR. Since we need to
write FRR configuration with the fabrics as well, move the FRR helper
files into its own FRR module, so they can be used by the EVPN plugin
as well as the future fabrics plugins.
The fact that the EVPN controller was solely responsible for
generating the FRR config also meant, that FRR configuration was only
generated if you had an EVPN controller defined.
In the process of generating an FRR configuration, we used mainly two
formats:
frr_config: This is a perl hash, that loosely resembles the structure
of the FRR configuration file.
raw_config: This is an array, that contains strings, where each string
is a line in the FRR configuration. So the finished FRR configuration
consists of all the strings in the array joined by newlines.
Controllers used the frr_config format for generating FRR
configuration. The local configuration in /etc/frr/frr.conf.local also
gets parsed into this format. The fabrics perlmod module, returns the
raw_config format. This was behind the intention to make this split
more clear and handle the FRR config generation in two steps from now
on:
* generate a frr_config in all plugins that utilize that format
* convert it to the raw_config format
* append the configuration obtained via perlmod
* write the finished configuration to frr.conf
This process was already in place, but the distinction wasn't that
clear. During this process I renamed all methods to make clear which
format they accept / return.
Some functions have been split to make them more granular, so we can
use intermediate results. Most namely the generate_controller_rawconfig
function has been split into multiple functions.
Added documentation to all public FRR functions, so it is clearer
which format they expect, as well as which operations they perform on
the respective passed configurations.
For the future it might make sense to further split the FRR config
generation for zones and vnets into the respective Zone / VNet
Plugins, instead of in the EVPN controller, but this was beyond the
scope of this already quite large patch series.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 289 --------------
src/PVE/Network/SDN/Frr.pm | 371 ++++++++++++++++++
src/PVE/Network/SDN/Makefile | 2 +-
3 files changed, 372 insertions(+), 290 deletions(-)
create mode 100644 src/PVE/Network/SDN/Frr.pm
diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index c245ea29cf90..f9241a097798 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -356,293 +356,4 @@ sub find_isis_controller {
return $res;
}
-sub generate_frr_recurse{
- my ($final_config, $content, $parentkey, $level) = @_;
-
- my $keylist = {};
- $keylist->{'address-family'} = 1;
- $keylist->{router} = 1;
-
- my $exitkeylist = {};
- $exitkeylist->{'address-family'} = 1;
-
- my $simple_exitkeylist = {};
- $simple_exitkeylist->{router} = 1;
-
- # FIXME: make this generic
- my $paddinglevel = undef;
- if ($level == 1 || $level == 2) {
- $paddinglevel = $level - 1;
- } elsif ($level == 3 || $level == 4) {
- $paddinglevel = $level - 2;
- }
-
- my $padding = "";
- $padding = ' ' x ($paddinglevel) if $paddinglevel;
-
- if (ref $content eq 'HASH') {
- foreach my $key (sort keys %$content) {
- next if $key eq 'vrf';
- if ($parentkey && defined($keylist->{$parentkey})) {
- push @{$final_config}, $padding."!";
- push @{$final_config}, $padding."$parentkey $key";
- } elsif ($key ne '' && !defined($keylist->{$key})) {
- push @{$final_config}, $padding."$key";
- }
-
- my $option = $content->{$key};
- generate_frr_recurse($final_config, $option, $key, $level+1);
-
- push @{$final_config}, $padding."exit-$parentkey" if $parentkey && defined($exitkeylist->{$parentkey});
- push @{$final_config}, $padding."exit" if $parentkey && defined($simple_exitkeylist->{$parentkey});
- }
- }
-
- if (ref $content eq 'ARRAY') {
- push @{$final_config}, map { $padding . "$_" } @$content;
- }
-}
-
-sub generate_frr_vrf {
- my ($final_config, $vrfs) = @_;
-
- return if !$vrfs;
-
- my @config = ();
-
- foreach my $id (sort keys %$vrfs) {
- my $vrf = $vrfs->{$id};
- push @config, "!";
- push @config, "vrf $id";
- foreach my $rule (@$vrf) {
- push @config, " $rule";
-
- }
- push @config, "exit-vrf";
- }
-
- push @{$final_config}, @config;
-}
-
-sub generate_frr_simple_list {
- my ($final_config, $rules) = @_;
-
- return if !$rules;
-
- my @config = ();
- push @{$final_config}, "!";
- foreach my $rule (sort @$rules) {
- push @{$final_config}, $rule;
- }
-}
-
-sub generate_frr_interfaces {
- my ($final_config, $interfaces) = @_;
-
- foreach my $k (sort keys %$interfaces) {
- my $iface = $interfaces->{$k};
- push @{$final_config}, "!";
- push @{$final_config}, "interface $k";
- foreach my $rule (sort @$iface) {
- push @{$final_config}, " $rule";
- }
- }
-}
-
-sub generate_frr_routemap {
- my ($final_config, $routemaps) = @_;
-
- foreach my $id (sort keys %$routemaps) {
-
- my $routemap = $routemaps->{$id};
- my $order = 0;
- foreach my $seq (@$routemap) {
- $order++;
- next if !defined($seq->{action});
- my @config = ();
- push @config, "!";
- push @config, "route-map $id $seq->{action} $order";
- my $rule = $seq->{rule};
- push @config, map { " $_" } @$rule;
- push @{$final_config}, @config;
- push @{$final_config}, "exit";
- }
- }
-}
-
-sub generate_frr_list {
- my ($final_config, $lists, $type) = @_;
-
- my $config = [];
-
- for my $id (sort keys %$lists) {
- my $list = $lists->{$id};
-
- for my $seq (sort keys %$list) {
- my $rule = $list->{$seq};
- push @$config, "$type $id seq $seq $rule";
- }
- }
-
- if (@$config > 0) {
- push @{$final_config}, "!", @$config;
- }
-}
-
-sub read_local_frr_config {
- if (-e "/etc/frr/frr.conf.local") {
- return file_get_contents("/etc/frr/frr.conf.local");
- }
-};
-
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
-
- my $nodename = PVE::INotify::nodename();
-
- my $final_config = [];
- push @{$final_config}, "frr version 8.5.2";
- push @{$final_config}, "frr defaults datacenter";
- push @{$final_config}, "hostname $nodename";
- push @{$final_config}, "log syslog informational";
- push @{$final_config}, "service integrated-vtysh-config";
- push @{$final_config}, "!";
-
- my $local_conf = read_local_frr_config();
- if ($local_conf) {
- parse_merge_frr_local_config($config, $local_conf);
- }
-
- generate_frr_vrf($final_config, $config->{frr}->{vrf});
- generate_frr_interfaces($final_config, $config->{frr_interfaces});
- generate_frr_recurse($final_config, $config->{frr}, undef, 0);
- generate_frr_list($final_config, $config->{frr_access_list}, "access-list");
- generate_frr_list($final_config, $config->{frr_prefix_list}, "ip prefix-list");
- generate_frr_list($final_config, $config->{frr_prefix_list_v6}, "ipv6 prefix-list");
- generate_frr_simple_list($final_config, $config->{frr_bgp_community_list});
- generate_frr_routemap($final_config, $config->{frr_routemap});
- generate_frr_simple_list($final_config, $config->{frr_ip_protocol});
-
- push @{$final_config}, "!";
- push @{$final_config}, "line vty";
- push @{$final_config}, "!";
-
- my $rawconfig = join("\n", @{$final_config});
-
- return if !$rawconfig;
- return $rawconfig;
-}
-
-sub parse_merge_frr_local_config {
- my ($config, $local_conf) = @_;
-
- my $section = \$config->{""};
- my $router = undef;
- my $routemap = undef;
- my $routemap_config = ();
- my $routemap_action = undef;
-
- while ($local_conf =~ /^\s*(.+?)\s*$/gm) {
- my $line = $1;
- $line =~ s/^\s+|\s+$//g;
-
- if ($line =~ m/^router (.+)$/) {
- $router = $1;
- $section = \$config->{'frr'}->{'router'}->{$router}->{""};
- next;
- } elsif ($line =~ m/^vrf (.+)$/) {
- $section = \$config->{'frr'}->{'vrf'}->{$1};
- next;
- } elsif ($line =~ m/^interface (.+)$/) {
- $section = \$config->{'frr_interfaces'}->{$1};
- next;
- } elsif ($line =~ m/^bgp community-list (.+)$/) {
- push(@{$config->{'frr_bgp_community_list'}}, $line);
- next;
- } elsif ($line =~ m/address-family (.+)$/) {
- $section = \$config->{'frr'}->{'router'}->{$router}->{'address-family'}->{$1};
- next;
- } elsif ($line =~ m/^route-map (.+) (permit|deny) (\d+)/) {
- $routemap = $1;
- $routemap_config = ();
- $routemap_action = $2;
- $section = \$config->{'frr_routemap'}->{$routemap};
- next;
- } elsif ($line =~ m/^access-list (.+) seq (\d+) (.+)$/) {
- $config->{'frr_access_list'}->{$1}->{$2} = $3;
- next;
- } elsif ($line =~ m/^ip prefix-list (.+) seq (\d+) (.*)$/) {
- $config->{'frr_prefix_list'}->{$1}->{$2} = $3;
- next;
- } elsif ($line =~ m/^ipv6 prefix-list (.+) seq (\d+) (.*)$/) {
- $config->{'frr_prefix_list_v6'}->{$1}->{$2} = $3;
- next;
- } elsif($line =~ m/^exit-address-family$/) {
- next;
- } elsif($line =~ m/^exit$/) {
- if($router) {
- $section = \$config->{''};
- $router = undef;
- } elsif($routemap) {
- push(@{$$section}, { rule => $routemap_config, action => $routemap_action });
- $section = \$config->{''};
- $routemap = undef;
- $routemap_action = undef;
- $routemap_config = ();
- }
- next;
- } elsif($line =~ m/!/) {
- next;
- }
-
- next if !$section;
- if($routemap) {
- push(@{$routemap_config}, $line);
- } else {
- push(@{$$section}, $line);
- }
- }
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
-
- my $rawconfig = $class->generate_controller_rawconfig($plugin_config, $config);
- return if !$rawconfig;
- return if !-d "/etc/frr";
-
- file_set_contents("/etc/frr/frr.conf", $rawconfig);
-}
-
-sub reload_controller {
- my ($class) = @_;
-
- my $conf_file = "/etc/frr/frr.conf";
- my $bin_path = "/usr/lib/frr/frr-reload.py";
-
- if (!-e $bin_path) {
- log_warn("missing $bin_path. Please install frr-pythontools package");
- return;
- }
-
- my $err = sub {
- my $line = shift;
- if ($line =~ /ERROR:/) {
- warn "$line \n";
- }
- };
-
- if (-e $conf_file && -e $bin_path) {
- eval {
- run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
- };
- if ($@) {
- warn "frr reload command fail. Restarting frr.";
- eval { run_command(['systemctl', 'restart', 'frr']); };
- }
- }
-}
-
1;
-
-
diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
new file mode 100644
index 000000000000..bb0f197d8dea
--- /dev/null
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -0,0 +1,371 @@
+package PVE::Network::SDN::Frr;
+
+use strict;
+use warnings;
+
+=head1 NAME
+
+C<PVE::Network::SDN::Frr> - Helper module for FRR
+
+=head1 DESCRIPTION
+
+This module contains helpers for handling the various intermediate FRR
+configuration formats.
+
+We currently mainly use two different intermediate formats throughout the SDN
+module:
+
+=head2 frr config
+
+An frr config represented as a perl hash. The controller plugins generate their
+frr configuration in this format. This format is also used for merging the local
+FRR config (a user-defined configuration file) with the controller-generated
+configuration.
+
+=head2 raw config
+
+This is generated from the frr config. It is an array where every entry is a
+string that is a FRR configuration line.
+
+=cut
+
+use PVE::RESTEnvironment qw(log_warn);
+use PVE::Tools qw(file_get_contents file_set_contents run_command);
+
+=head3 read_local_frr_config
+
+Returns the contents of `/etc/frr/frr.conf.local` as a string if it exists, otherwise undef.
+
+=cut
+
+sub read_local_frr_config {
+ if (-e "/etc/frr/frr.conf.local") {
+ return file_get_contents("/etc/frr/frr.conf.local");
+ }
+};
+
+=head3 reload()
+
+Tries to reload FRR with the frr-reload.py script from frr-pythontools. If that
+isn't installed or doesn't work it falls back to restarting the systemd frr
+service.
+
+=cut
+
+sub reload {
+ my $conf_file = "/etc/frr/frr.conf";
+ my $bin_path = "/usr/lib/frr/frr-reload.py";
+
+ if (!-e $bin_path) {
+ log_warn("missing $bin_path. Please install frr-pythontools package");
+ return;
+ }
+
+ my $err = sub {
+ my $line = shift;
+ warn "$line \n";
+ };
+
+ if (-e $conf_file && -e $bin_path) {
+ eval {
+ run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
+ };
+ if ($@) {
+ warn "frr reload command fail. Restarting frr.";
+ eval { run_command(['systemctl', 'restart', 'frr']); };
+ }
+ }
+}
+
+=head3 to_raw_config(\%frr_config)
+
+Converts a given C<\%frr_config> to the raw config format.
+
+=cut
+
+sub to_raw_config {
+ my ($frr_config) = @_;
+
+ my $raw_config = [];
+
+ generate_frr_vrf($raw_config, $frr_config->{frr}->{vrf});
+ generate_frr_interfaces($raw_config, $frr_config->{frr_interfaces});
+ generate_frr_recurse($raw_config, $frr_config->{frr}, undef, 0);
+ generate_frr_list($raw_config, $frr_config->{frr_access_list}, "access-list");
+ generate_frr_list($raw_config, $frr_config->{frr_prefix_list}, "ip prefix-list");
+ generate_frr_list($raw_config, $frr_config->{frr_prefix_list_v6}, "ipv6 prefix-list");
+ generate_frr_simple_list($raw_config, $frr_config->{frr_bgp_community_list});
+ generate_frr_routemap($raw_config, $frr_config->{frr_routemap});
+ generate_frr_simple_list($raw_config, $frr_config->{frr_ip_protocol});
+
+ return $raw_config;
+}
+
+=head3 raw_config_to_string(\@raw_config)
+
+Converts a given C<\@raw_config> to a string representing a complete frr
+configuration, ready to be written to /etc/frr/frr.conf. If raw_config is empty,
+returns an empty string.
+
+=cut
+
+sub raw_config_to_string {
+ my ($raw_config) = @_;
+
+ return "" if !scalar @$raw_config;
+
+ my $nodename = PVE::INotify::nodename();
+
+ my @final_config = (
+ "frr version 8.5.2",
+ "frr defaults datacenter",
+ "hostname $nodename",
+ "log syslog informational",
+ "service integrated-vtysh-config",
+ "!",
+ );
+
+ push @final_config, @$raw_config;
+
+ push @final_config, (
+ "!",
+ "line vty",
+ "!",
+ );
+
+ return join("\n", @final_config);
+}
+
+=head3 raw_config_to_string(\@raw_config)
+
+Writes a given C<\@raw_config> to /etc/frr/frr.conf.
+
+=cut
+
+sub write_raw_config {
+ my ($raw_config) = @_;
+
+ return if !-d "/etc/frr";
+ return if !$raw_config;
+
+ file_set_contents("/etc/frr/frr.conf", raw_config_to_string($raw_config));
+
+}
+
+=head3 append_local_config(\%frr_config, $local_config)
+
+Takes an existing C<\%frr_config> and C<$local_config> (as a string). It parses
+the local configuration and appends the values to the existing C<\%frr_config>
+in-place.
+
+=cut
+
+sub append_local_config {
+ my ($frr_config, $local_config) = @_;
+
+ $local_config = read_local_frr_config() if !$local_config;
+ return if !$local_config;
+
+ my $section = \$frr_config->{""};
+ my $router = undef;
+ my $routemap = undef;
+ my $routemap_config = ();
+ my $routemap_action = undef;
+
+ while ($local_config =~ /^\s*(.+?)\s*$/gm) {
+ my $line = $1;
+ $line =~ s/^\s+|\s+$//g;
+
+ if ($line =~ m/^router (.+)$/) {
+ $router = $1;
+ $section = \$frr_config->{'frr'}->{'router'}->{$router}->{""};
+ next;
+ } elsif ($line =~ m/^vrf (.+)$/) {
+ $section = \$frr_config->{'frr'}->{'vrf'}->{$1};
+ next;
+ } elsif ($line =~ m/^interface (.+)$/) {
+ $section = \$frr_config->{'frr_interfaces'}->{$1};
+ next;
+ } elsif ($line =~ m/^bgp community-list (.+)$/) {
+ push(@{$frr_config->{'frr_bgp_community_list'}}, $line);
+ next;
+ } elsif ($line =~ m/address-family (.+)$/) {
+ $section = \$frr_config->{'frr'}->{'router'}->{$router}->{'address-family'}->{$1};
+ next;
+ } elsif ($line =~ m/^route-map (.+) (permit|deny) (\d+)/) {
+ $routemap = $1;
+ $routemap_config = ();
+ $routemap_action = $2;
+ $section = \$frr_config->{'frr_routemap'}->{$routemap};
+ next;
+ } elsif ($line =~ m/^access-list (.+) seq (\d+) (.+)$/) {
+ $frr_config->{'frr_access_list'}->{$1}->{$2} = $3;
+ next;
+ } elsif ($line =~ m/^ip prefix-list (.+) seq (\d+) (.*)$/) {
+ $frr_config->{'frr_prefix_list'}->{$1}->{$2} = $3;
+ next;
+ } elsif ($line =~ m/^ipv6 prefix-list (.+) seq (\d+) (.*)$/) {
+ $frr_config->{'frr_prefix_list_v6'}->{$1}->{$2} = $3;
+ next;
+ } elsif($line =~ m/^exit-address-family$/) {
+ next;
+ } elsif($line =~ m/^exit$/) {
+ if($router) {
+ $section = \$frr_config->{''};
+ $router = undef;
+ } elsif($routemap) {
+ push(@{$$section}, { rule => $routemap_config, action => $routemap_action });
+ $section = \$frr_config->{''};
+ $routemap = undef;
+ $routemap_action = undef;
+ $routemap_config = ();
+ }
+ next;
+ } elsif($line =~ m/!/) {
+ next;
+ }
+
+ next if !$section;
+ if($routemap) {
+ push(@{$routemap_config}, $line);
+ } else {
+ push(@{$$section}, $line);
+ }
+ }
+}
+
+sub generate_frr_recurse {
+ my ($final_config, $content, $parentkey, $level) = @_;
+
+ my $keylist = {};
+ $keylist->{'address-family'} = 1;
+ $keylist->{router} = 1;
+
+ my $exitkeylist = {};
+ $exitkeylist->{'address-family'} = 1;
+
+ my $simple_exitkeylist = {};
+ $simple_exitkeylist->{router} = 1;
+
+ # FIXME: make this generic
+ my $paddinglevel = undef;
+ if ($level == 1 || $level == 2) {
+ $paddinglevel = $level - 1;
+ } elsif ($level == 3 || $level == 4) {
+ $paddinglevel = $level - 2;
+ }
+
+ my $padding = "";
+ $padding = ' ' x ($paddinglevel) if $paddinglevel;
+
+ if (ref $content eq 'HASH') {
+ foreach my $key (sort keys %$content) {
+ next if $key eq 'vrf';
+ if ($parentkey && defined($keylist->{$parentkey})) {
+ push @{$final_config}, $padding."!";
+ push @{$final_config}, $padding."$parentkey $key";
+ } elsif ($key ne '' && !defined($keylist->{$key})) {
+ push @{$final_config}, $padding."$key";
+ }
+
+ my $option = $content->{$key};
+ generate_frr_recurse($final_config, $option, $key, $level+1);
+
+ push @{$final_config}, $padding."exit-$parentkey" if $parentkey && defined($exitkeylist->{$parentkey});
+ push @{$final_config}, $padding."exit" if $parentkey && defined($simple_exitkeylist->{$parentkey});
+ }
+ }
+
+ if (ref $content eq 'ARRAY') {
+ push @{$final_config}, map { $padding . "$_" } @$content;
+ }
+}
+
+sub generate_frr_vrf {
+ my ($final_config, $vrfs) = @_;
+
+ return if !$vrfs;
+
+ my @config = ();
+
+ foreach my $id (sort keys %$vrfs) {
+ my $vrf = $vrfs->{$id};
+ push @config, "!";
+ push @config, "vrf $id";
+ foreach my $rule (@$vrf) {
+ push @config, " $rule";
+
+ }
+ push @config, "exit-vrf";
+ }
+
+ push @{$final_config}, @config;
+}
+
+sub generate_frr_simple_list {
+ my ($final_config, $rules) = @_;
+
+ return if !$rules;
+
+ my @config = ();
+ push @{$final_config}, "!";
+ foreach my $rule (sort @$rules) {
+ push @{$final_config}, $rule;
+ }
+}
+
+sub generate_frr_list {
+ my ($final_config, $lists, $type) = @_;
+
+ my $config = [];
+
+ for my $id (sort keys %$lists) {
+ my $list = $lists->{$id};
+
+ for my $seq (sort keys %$list) {
+ my $rule = $list->{$seq};
+ push @$config, "$type $id seq $seq $rule";
+ }
+ }
+
+ if (@$config > 0) {
+ push @{$final_config}, "!", @$config;
+ }
+}
+
+
+sub generate_frr_interfaces {
+ my ($final_config, $interfaces) = @_;
+
+ foreach my $k (sort keys %$interfaces) {
+ my $iface = $interfaces->{$k};
+ push @{$final_config}, "!";
+ push @{$final_config}, "interface $k";
+ foreach my $rule (sort @$iface) {
+ push @{$final_config}, " $rule";
+ }
+ }
+}
+
+sub generate_frr_routemap {
+ my ($final_config, $routemaps) = @_;
+
+ foreach my $id (sort keys %$routemaps) {
+
+ my $routemap = $routemaps->{$id};
+ my $order = 0;
+ foreach my $seq (@$routemap) {
+ $order++;
+ next if !defined($seq->{action});
+ my @config = ();
+ push @config, "!";
+ push @config, "route-map $id $seq->{action} $order";
+ my $rule = $seq->{rule};
+ push @config, map { " $_" } @$rule;
+ push @{$final_config}, @config;
+ push @{$final_config}, "exit";
+ }
+ }
+}
+
+1;
diff --git a/src/PVE/Network/SDN/Makefile b/src/PVE/Network/SDN/Makefile
index a256642e3044..d1ffef9eebe7 100644
--- a/src/PVE/Network/SDN/Makefile
+++ b/src/PVE/Network/SDN/Makefile
@@ -1,4 +1,4 @@
-SOURCES=Vnets.pm VnetPlugin.pm Zones.pm Controllers.pm Subnets.pm SubnetPlugin.pm Ipams.pm Dns.pm Dhcp.pm Fabrics.pm
+SOURCES=Vnets.pm VnetPlugin.pm Zones.pm Controllers.pm Subnets.pm SubnetPlugin.pm Ipams.pm Dns.pm Dhcp.pm Fabrics.pm Frr.pm
PERL5DIR=${DESTDIR}/usr/share/perl5
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 05/17] controllers: implement new api for frr config generation
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (30 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 04/17] refactor: controller: move frr methods into helper Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 06/17] sdn: add frr config generation helper Gabriel Goller
` (21 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
With the changes to how we handle the frr config generation,
controllers are now no longer responsible for generating the FRR
configuration. Instead, we pass the existing frr_config perl hash to
every controller, where controllers append their respective
configuration.
This requires a few changes in the controller API, so that they now
append to a passed perl hash, instead of directly writing their own
configuration which is now handled externally by the SDN module.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN/Controllers.pm | 67 +++----------------
src/PVE/Network/SDN/Controllers/BgpPlugin.pm | 21 +-----
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 6 +-
src/PVE/Network/SDN/Controllers/IsisPlugin.pm | 21 +-----
src/PVE/Network/SDN/Controllers/Plugin.pm | 31 +--------
5 files changed, 19 insertions(+), 127 deletions(-)
diff --git a/src/PVE/Network/SDN/Controllers.pm b/src/PVE/Network/SDN/Controllers.pm
index 9e8f3aa12a89..788bfccd3aff 100644
--- a/src/PVE/Network/SDN/Controllers.pm
+++ b/src/PVE/Network/SDN/Controllers.pm
@@ -79,12 +79,12 @@ sub read_etc_network_interfaces {
return $interfaces_config;
}
-sub generate_controller_config {
+sub generate_frr_config {
+ my ($frr_config, $sdn_config) = @_;
- my $cfg = PVE::Network::SDN::running_config();
- my $vnet_cfg = $cfg->{vnets};
- my $zone_cfg = $cfg->{zones};
- my $controller_cfg = $cfg->{controllers};
+ my $vnet_cfg = $sdn_config->{vnets};
+ my $zone_cfg = $sdn_config->{zones};
+ my $controller_cfg = $sdn_config->{controllers};
return if !$vnet_cfg && !$zone_cfg && !$controller_cfg;
@@ -101,13 +101,10 @@ sub generate_controller_config {
}
}
- # generate configuration
- my $config = {};
-
foreach my $id (sort keys %{$controller_cfg->{ids}}) {
my $plugin_config = $controller_cfg->{ids}->{$id};
my $plugin = PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $plugin->generate_controller_config($plugin_config, $controller_cfg, $id, $uplinks, $config);
+ $plugin->generate_frr_config($plugin_config, $controller_cfg, $id, $uplinks, $frr_config);
}
foreach my $id (sort keys %{$zone_cfg->{ids}}) {
@@ -117,7 +114,7 @@ sub generate_controller_config {
my $controller = $controller_cfg->{ids}->{$controllerid};
if ($controller) {
my $controller_plugin = PVE::Network::SDN::Controllers::Plugin->lookup($controller->{type});
- $controller_plugin->generate_controller_zone_config($plugin_config, $controller, $controller_cfg, $id, $uplinks, $config);
+ $controller_plugin->generate_zone_frr_config($plugin_config, $controller, $controller_cfg, $id, $uplinks, $frr_config);
}
}
@@ -132,57 +129,11 @@ sub generate_controller_config {
my $controller = $controller_cfg->{ids}->{$controllerid};
if ($controller) {
my $controller_plugin = PVE::Network::SDN::Controllers::Plugin->lookup($controller->{type});
- $controller_plugin->generate_controller_vnet_config($plugin_config, $controller, $zone, $zoneid, $id, $config);
+ $controller_plugin->generate_vnet_frr_config($plugin_config, $controller, $zone, $zoneid, $id, $frr_config);
}
}
- return $config;
-}
-
-
-sub reload_controller {
-
- my $cfg = PVE::Network::SDN::running_config();
- my $controller_cfg = $cfg->{controllers};
-
- return if !$controller_cfg;
-
- foreach my $id (keys %{$controller_cfg->{ids}}) {
- my $plugin_config = $controller_cfg->{ids}->{$id};
- my $plugin = PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $plugin->reload_controller();
- }
-}
-
-sub generate_controller_rawconfig {
- my ($config) = @_;
-
- my $cfg = PVE::Network::SDN::running_config();
- my $controller_cfg = $cfg->{controllers};
- return if !$controller_cfg;
-
- my $rawconfig = "";
- foreach my $id (keys %{$controller_cfg->{ids}}) {
- my $plugin_config = $controller_cfg->{ids}->{$id};
- my $plugin = PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $rawconfig .= $plugin->generate_controller_rawconfig($plugin_config, $config);
- }
- return $rawconfig;
-}
-
-sub write_controller_config {
- my ($config) = @_;
-
- my $cfg = PVE::Network::SDN::running_config();
- my $controller_cfg = $cfg->{controllers};
- return if !$controller_cfg;
-
- foreach my $id (keys %{$controller_cfg->{ids}}) {
- my $plugin_config = $controller_cfg->{ids}->{$id};
- my $plugin = PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $plugin->write_controller_config($plugin_config, $config);
- }
+ return $frr_config;
}
1;
-
diff --git a/src/PVE/Network/SDN/Controllers/BgpPlugin.pm b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
index 53963e5ad7f4..3b21cada2d8d 100644
--- a/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
@@ -53,7 +53,7 @@ sub options {
}
# Plugin implementation
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller, $id, $uplinks, $config) = @_;
my @peers;
@@ -132,7 +132,7 @@ sub generate_controller_config {
return $config;
}
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks, $config) = @_;
}
@@ -164,21 +164,4 @@ sub on_update_hook {
}
}
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
- return "";
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
- return;
-}
-
-sub reload_controller {
- my ($class) = @_;
- return;
-}
-
1;
-
-
diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index f9241a097798..bde331fb12c4 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -41,7 +41,7 @@ sub options {
}
# Plugin implementation
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller_cfg, $id, $uplinks, $config) = @_;
my @peers;
@@ -119,7 +119,7 @@ sub generate_controller_config {
return $config;
}
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks, $config) = @_;
my $local_node = PVE::INotify::nodename();
@@ -279,7 +279,7 @@ sub generate_controller_zone_config {
return $config;
}
-sub generate_controller_vnet_config {
+sub generate_vnet_frr_config {
my ($class, $plugin_config, $controller, $zone, $zoneid, $vnetid, $config) = @_;
my $exitnodes = $zone->{'exitnodes'};
diff --git a/src/PVE/Network/SDN/Controllers/IsisPlugin.pm b/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
index 97c6876db303..ace19aa7ffdc 100644
--- a/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
@@ -55,7 +55,7 @@ sub options {
}
# Plugin implementation
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller, $id, $uplinks, $config) = @_;
my $isis_ifaces = $plugin_config->{'isis-ifaces'};
@@ -87,7 +87,7 @@ sub generate_controller_config {
return $config;
}
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks, $config) = @_;
}
@@ -113,21 +113,4 @@ sub on_update_hook {
}
}
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
- return "";
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
- return;
-}
-
-sub reload_controller {
- my ($class) = @_;
- return;
-}
-
1;
-
-
diff --git a/src/PVE/Network/SDN/Controllers/Plugin.pm b/src/PVE/Network/SDN/Controllers/Plugin.pm
index d6ffc5f35c74..26beff3370a8 100644
--- a/src/PVE/Network/SDN/Controllers/Plugin.pm
+++ b/src/PVE/Network/SDN/Controllers/Plugin.pm
@@ -63,48 +63,23 @@ sub parse_section_header {
return undef;
}
-sub generate_sdn_config {
- my ($class, $plugin_config, $node, $data, $ctime) = @_;
-
- die "please implement inside plugin";
-}
-
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller_cfg, $id, $uplinks, $config) = @_;
die "please implement inside plugin";
}
-
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks, $config) = @_;
die "please implement inside plugin";
}
-sub generate_controller_vnet_config {
+sub generate_vnet_frr_config {
my ($class, $plugin_config, $controller, $zoneid, $vnetid, $config) = @_;
}
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
-
- die "please implement inside plugin";
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
-
- die "please implement inside plugin";
-}
-
-sub controller_reload {
- my ($class) = @_;
-
- die "please implement inside plugin";
-}
-
sub on_delete_hook {
my ($class, $controllerid, $zone_cfg) = @_;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 06/17] sdn: add frr config generation helper
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (31 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 05/17] controllers: implement new api for frr config generation Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 07/17] test: isis: add test for standalone configuration Gabriel Goller
` (20 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Adds a new method to the SDN module that is responsible for generating
and writing the FRR configuration for all SDN plugins combined. It
utilizes the newly introduced FRR helper as well as the newly
introduced API for the controllers to generate an frr_config instead
of generating the configuration in the controller directly. It can
also reload the FRR daemon.
Change the tests to use this new API as well, so they use the new
methods for generating the frr configuration.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN.pm | 43 ++++++++++++++++++++++++++++++----
src/PVE/Network/SDN/Fabrics.pm | 15 ++++++++++++
src/test/run_test_zones.pl | 9 ++++---
3 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index c9c45b1c07ea..b777a098a987 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -20,6 +20,8 @@ use PVE::Network::SDN::Zones;
use PVE::Network::SDN::Controllers;
use PVE::Network::SDN::Subnets;
use PVE::Network::SDN::Dhcp;
+use PVE::Network::SDN::Frr;
+use PVE::Network::SDN::Fabrics;
my $running_cfg = "sdn/.running-config";
@@ -226,13 +228,46 @@ sub generate_zone_config {
PVE::Network::SDN::Zones::write_etc_network_config($raw_config);
}
-sub generate_controller_config {
+=head3 generate_frr_raw_config(\%running_config, \%fabric_config)
+
+Generates the raw frr config (as documented in the C<PVE::Network::SDN::Frr>
+module) for all SDN plugins combined.
+
+If provided, uses the passed C<\%running_config> und C<\%fabric_config> to avoid
+re-parsing and re-reading both configurations. If not provided, this function
+will obtain them via the SDN and SDN::Fabrics modules and then generate the FRR
+configuration.
+
+=cut
+
+sub generate_frr_raw_config {
+ my ($running_config, $fabric_config) = @_;
+
+ $running_config = PVE::Network::SDN::running_config() if !$running_config;
+ $fabric_config = PVE::Network::SDN::Fabrics::config(1) if !$fabric_config;
+
+ my $frr_config = {};
+ PVE::Network::SDN::Controllers::generate_frr_config($frr_config, $running_config);
+ PVE::Network::SDN::Frr::append_local_config($frr_config);
+
+ my $raw_config = PVE::Network::SDN::Frr::to_raw_config($frr_config);
+
+ my $fabrics_config = PVE::Network::SDN::Fabrics::generate_frr_raw_config($fabric_config);
+ push @$raw_config, @$fabrics_config;
+
+ return $raw_config;
+}
+
+sub generate_frr_config {
my ($reload) = @_;
- my $raw_config = PVE::Network::SDN::Controllers::generate_controller_config();
- PVE::Network::SDN::Controllers::write_controller_config($raw_config);
+ my $running_config = PVE::Network::SDN::running_config();
+ my $fabric_config = PVE::Network::SDN::Fabrics::config(1);
+
+ my $raw_config = PVE::Network::SDN::generate_frr_raw_config($running_config, $fabric_config);
+ PVE::Network::SDN::Frr::write_raw_config($raw_config);
- PVE::Network::SDN::Controllers::reload_controller() if $reload;
+ PVE::Network::SDN::Frr::reload() if $reload;
}
sub generate_dhcp_config {
diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
index 5f31fb503f48..6e3fa5234a5b 100644
--- a/src/PVE/Network/SDN/Fabrics.pm
+++ b/src/PVE/Network/SDN/Fabrics.pm
@@ -69,6 +69,21 @@ sub config_for_protocol {
return $module->config($section_config);
}
+sub generate_frr_raw_config {
+ my ($fabric_config) = @_;
+
+ my @raw_config = ();
+
+ my $nodename = PVE::INotify::nodename();
+
+ for my $protocol (sort keys %$fabric_config) {
+ my $protocol_config = $fabric_config->{$protocol}->get_frr_raw_config($nodename);
+ push @raw_config, @$protocol_config if @$protocol_config;
+ }
+
+ return \@raw_config;
+}
+
sub write_config {
my ($config) = @_;
diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl
index e506bea1a965..4137da6b2687 100755
--- a/src/test/run_test_zones.pl
+++ b/src/test/run_test_zones.pl
@@ -140,18 +140,17 @@ foreach my $test (@tests) {
if ($sdn_config->{controllers}) {
my $expected = read_file("./$test/expected_controller_config");
- my $controller_rawconfig = "";
+ my $config = "";
eval {
- my $config = PVE::Network::SDN::Controllers::generate_controller_config();
- $controller_rawconfig =
- PVE::Network::SDN::Controllers::generate_controller_rawconfig($config);
+ my $raw_config = PVE::Network::SDN::generate_frr_raw_config();
+ $config = PVE::Network::SDN::Frr::raw_config_to_string($raw_config);
};
if (my $err = $@) {
diag("got unexpected error - $err");
fail($name);
} else {
- is($controller_rawconfig, $expected, $name);
+ is($config, $expected, $name);
}
}
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 07/17] test: isis: add test for standalone configuration
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (32 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 06/17] sdn: add frr config generation helper Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper Gabriel Goller
` (19 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
With how the config generation worked before, it was not possible to
create a standalone isis controller. Since each controller is now
responsible for creating its own configuration, it is possible to
create a standalone isis controller without having any evpn
controller. Add a test that covers that scenario.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.../expected_controller_config | 22 +++++++++++++++++++
.../isis_standalone/expected_sdn_interfaces | 1 +
.../zones/evpn/isis_standalone/interfaces | 12 ++++++++++
.../zones/evpn/isis_standalone/sdn_config | 21 ++++++++++++++++++
4 files changed, 56 insertions(+)
create mode 100644 src/test/zones/evpn/isis_standalone/expected_controller_config
create mode 100644 src/test/zones/evpn/isis_standalone/expected_sdn_interfaces
create mode 100644 src/test/zones/evpn/isis_standalone/interfaces
create mode 100644 src/test/zones/evpn/isis_standalone/sdn_config
diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config
new file mode 100644
index 000000000000..5c9bf1adfbae
--- /dev/null
+++ b/src/test/zones/evpn/isis_standalone/expected_controller_config
@@ -0,0 +1,22 @@
+frr version 8.5.2
+frr defaults datacenter
+hostname localhost
+log syslog informational
+service integrated-vtysh-config
+!
+!
+interface eth0
+ ip router isis isis1
+!
+interface eth1
+ ip router isis isis1
+!
+router isis isis1
+ net 47.0023.0000.0000.0000.0000.0000.0000.1900.0004.00
+ redistribute ipv4 connected level-1
+ redistribute ipv6 connected level-1
+ log-adjacency-changes
+exit
+!
+line vty
+!
\ No newline at end of file
diff --git a/src/test/zones/evpn/isis_standalone/expected_sdn_interfaces b/src/test/zones/evpn/isis_standalone/expected_sdn_interfaces
new file mode 100644
index 000000000000..edc8ff918531
--- /dev/null
+++ b/src/test/zones/evpn/isis_standalone/expected_sdn_interfaces
@@ -0,0 +1 @@
+#version:1
diff --git a/src/test/zones/evpn/isis_standalone/interfaces b/src/test/zones/evpn/isis_standalone/interfaces
new file mode 100644
index 000000000000..41ae25fda5c3
--- /dev/null
+++ b/src/test/zones/evpn/isis_standalone/interfaces
@@ -0,0 +1,12 @@
+auto vmbr0
+iface vmbr0 inet static
+ address 192.168.0.1/24
+ gateway 192.168.0.254
+ bridge-ports eth0
+ bridge-stp off
+ bridge-fd 0
+
+auto dummy1
+iface dummy1 inet static
+ address 10.0.0.1/32
+ link-type dummy
\ No newline at end of file
diff --git a/src/test/zones/evpn/isis_standalone/sdn_config b/src/test/zones/evpn/isis_standalone/sdn_config
new file mode 100644
index 000000000000..331051f3a2c9
--- /dev/null
+++ b/src/test/zones/evpn/isis_standalone/sdn_config
@@ -0,0 +1,21 @@
+{
+ version => 1,
+ vnets => {
+ },
+ zones => {
+ },
+ controllers => {
+ ids => {
+ localhost => {
+ type => "isis",
+ 'isis-domain' => 'isis1',
+ 'isis-ifaces' => 'eth1,eth0',
+ 'isis-net' => "47.0023.0000.0000.0000.0000.0000.0000.1900.0004.00",
+ loopback => 'dummy1',
+ node => "localhost",
+ },
+ },
+ },
+ subnets => {
+ },
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (33 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 07/17] test: isis: add test for standalone configuration Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:41 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config Gabriel Goller
` (18 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Add functions that allow reading and manipulating values in the
/etc/frr/daemons file. We need this for en/disabling daemons depending
on which fabric types are configured. We only enable daemons which are
required for the configured fabrics. If a daemon is enabled but a
fabric gets deleted, we disable them.
The helper works by iterating over the lines of the daemons file from
FRR, parsing the key and checking if the key is managed by the SDN
configuration, then sets it. As a safeguard, keys that can be changed
by SDN have to be explicitly configured in the respective hash of the
Frr module.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN.pm | 15 +++++++++++
src/PVE/Network/SDN/Fabrics.pm | 18 +++++++++++++
src/PVE/Network/SDN/Frr.pm | 49 ++++++++++++++++++++++++++++++++++
3 files changed, 82 insertions(+)
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index b777a098a987..a0b61275e10b 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -258,12 +258,27 @@ sub generate_frr_raw_config {
return $raw_config;
}
+=head3 get_frr_daemon_status(\%running_config, \%fabric_config)
+
+Returns a hash that indicates the status of the FRR daemons managed by SDN.
+
+=cut
+
+sub get_frr_daemon_status {
+ my ($running_config, $fabric_config) = @_;
+
+ return PVE::Network::SDN::Fabrics::get_frr_daemon_status($fabric_config);
+}
+
sub generate_frr_config {
my ($reload) = @_;
my $running_config = PVE::Network::SDN::running_config();
my $fabric_config = PVE::Network::SDN::Fabrics::config(1);
+ my $daemon_status = PVE::Network::SDN::get_frr_daemon_status($running_config, $fabric_config);
+ PVE::Network::SDN::Frr::set_daemon_status($daemon_status);
+
my $raw_config = PVE::Network::SDN::generate_frr_raw_config($running_config, $fabric_config);
PVE::Network::SDN::Frr::write_raw_config($raw_config);
diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
index 6e3fa5234a5b..d716c68feac4 100644
--- a/src/PVE/Network/SDN/Fabrics.pm
+++ b/src/PVE/Network/SDN/Fabrics.pm
@@ -69,6 +69,24 @@ sub config_for_protocol {
return $module->config($section_config);
}
+sub get_frr_daemon_status {
+ my ($fabric_config) = @_;
+
+ my $daemon_status = {};
+ my $nodename = PVE::INotify::nodename();
+
+ for my $protocol (sort keys %$fabric_config) {
+ my $config = $fabric_config->{$protocol};
+ my $enabled_daemons = $config->enabled_daemons($nodename);
+
+ for my $daemon (@$enabled_daemons) {
+ $daemon_status->{$daemon} = 1;
+ }
+ }
+
+ return $daemon_status;
+}
+
sub generate_frr_raw_config {
my ($fabric_config) = @_;
diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
index bb0f197d8dea..9ae302a9c25f 100644
--- a/src/PVE/Network/SDN/Frr.pm
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -77,6 +77,55 @@ sub reload {
}
}
+my $SDN_DAEMONS_DEFAULT = {
+ ospfd => 0,
+ fabricd => 0,
+};
+
+=head3 set_daemon_status(\%daemons, $set_default)
+
+Sets the status of all daemons supplied in C<\%daemons>. This only works for
+daemons managed by SDN, as indicated in the C<$SDN_DAEMONS_DEFAULT> constant. If
+a daemon is supplied that isn't managed by SDN then this command will fail. If
+C<$set_default> is set, then additionally all sdn-managed daemons that are
+missing in C<\%daemons> are reset to their default value.
+
+=cut
+
+sub set_daemon_status {
+ my ($daemon_status, $set_default) = @_;
+
+ for my $daemon (keys %$daemon_status) {
+ die "$daemon is not SDN managed" if !defined $SDN_DAEMONS_DEFAULT->{$daemon};
+ }
+
+ my $daemons_file = "/etc/frr/daemons";
+
+ my $old_config = PVE::Tools::file_get_contents($daemons_file);
+ my $new_config = "";
+
+ my @lines = split(/\n/, $old_config);
+
+ for my $line (@lines) {
+ if ($line =~ m/^([a-z_]+)=/) {
+ my $key = $1;
+
+ my $status = $daemon_status->{$key};
+ $status = $SDN_DAEMONS_DEFAULT->{$key} if !defined $status && $set_default;
+
+ if (defined $status) {
+ my $value = $status ? "yes" : "no";
+ $new_config .= "$key=$value\n";
+ next;
+ }
+ }
+
+ $new_config .= "$line\n";
+ }
+
+ PVE::Tools::file_set_contents($daemons_file, $new_config);
+}
+
=head3 to_raw_config(\%frr_config)
Converts a given C<\%frr_config> to the raw config format.
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper Gabriel Goller
@ 2025-04-02 10:41 ` Fabian Grünbichler
2025-04-02 10:50 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:41 UTC (permalink / raw)
To: Proxmox VE development discussion
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Add functions that allow reading and manipulating values in the
> /etc/frr/daemons file. We need this for en/disabling daemons depending
> on which fabric types are configured. We only enable daemons which are
> required for the configured fabrics. If a daemon is enabled but a
> fabric gets deleted, we disable them.
>
> The helper works by iterating over the lines of the daemons file from
> FRR, parsing the key and checking if the key is managed by the SDN
> configuration, then sets it. As a safeguard, keys that can be changed
> by SDN have to be explicitly configured in the respective hash of the
> Frr module.
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/Network/SDN.pm | 15 +++++++++++
> src/PVE/Network/SDN/Fabrics.pm | 18 +++++++++++++
> src/PVE/Network/SDN/Frr.pm | 49 ++++++++++++++++++++++++++++++++++
> 3 files changed, 82 insertions(+)
>
> diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
> index b777a098a987..a0b61275e10b 100644
> --- a/src/PVE/Network/SDN.pm
> +++ b/src/PVE/Network/SDN.pm
> @@ -258,12 +258,27 @@ sub generate_frr_raw_config {
> return $raw_config;
> }
>
> +=head3 get_frr_daemon_status(\%running_config, \%fabric_config)
> +
> +Returns a hash that indicates the status of the FRR daemons managed by SDN.
> +
> +=cut
> +
> +sub get_frr_daemon_status {
> + my ($running_config, $fabric_config) = @_;
> +
> + return PVE::Network::SDN::Fabrics::get_frr_daemon_status($fabric_config);
this takes but doesn't use the $running_config.. is this intentional?
> +}
> +
> sub generate_frr_config {
> my ($reload) = @_;
>
> my $running_config = PVE::Network::SDN::running_config();
> my $fabric_config = PVE::Network::SDN::Fabrics::config(1);
>
> + my $daemon_status = PVE::Network::SDN::get_frr_daemon_status($running_config, $fabric_config);
the getter has a top-level wrapper
> + PVE::Network::SDN::Frr::set_daemon_status($daemon_status);
but the setter doesn't? seems inconsistent ;)
> +
> my $raw_config = PVE::Network::SDN::generate_frr_raw_config($running_config, $fabric_config);
> PVE::Network::SDN::Frr::write_raw_config($raw_config);
>
> diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
> index 6e3fa5234a5b..d716c68feac4 100644
> --- a/src/PVE/Network/SDN/Fabrics.pm
> +++ b/src/PVE/Network/SDN/Fabrics.pm
> @@ -69,6 +69,24 @@ sub config_for_protocol {
> return $module->config($section_config);
> }
>
> +sub get_frr_daemon_status {
> + my ($fabric_config) = @_;
> +
> + my $daemon_status = {};
> + my $nodename = PVE::INotify::nodename();
> +
> + for my $protocol (sort keys %$fabric_config) {
> + my $config = $fabric_config->{$protocol};
this could iterate over the values instead? ;)
> + my $enabled_daemons = $config->enabled_daemons($nodename);
> +
> + for my $daemon (@$enabled_daemons) {
> + $daemon_status->{$daemon} = 1;
> + }
> + }
> +
> + return $daemon_status;
> +}
> +
> sub generate_frr_raw_config {
> my ($fabric_config) = @_;
>
> diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
> index bb0f197d8dea..9ae302a9c25f 100644
> --- a/src/PVE/Network/SDN/Frr.pm
> +++ b/src/PVE/Network/SDN/Frr.pm
> @@ -77,6 +77,55 @@ sub reload {
> }
> }
>
> +my $SDN_DAEMONS_DEFAULT = {
> + ospfd => 0,
> + fabricd => 0,
> +};
> +
> +=head3 set_daemon_status(\%daemons, $set_default)
> +
> +Sets the status of all daemons supplied in C<\%daemons>. This only works for
> +daemons managed by SDN, as indicated in the C<$SDN_DAEMONS_DEFAULT> constant. If
> +a daemon is supplied that isn't managed by SDN then this command will fail. If
> +C<$set_default> is set, then additionally all sdn-managed daemons that are
> +missing in C<\%daemons> are reset to their default value.
> +
> +=cut
> +
> +sub set_daemon_status {
> + my ($daemon_status, $set_default) = @_;
> +
> + for my $daemon (keys %$daemon_status) {
> + die "$daemon is not SDN managed" if !defined $SDN_DAEMONS_DEFAULT->{$daemon};
> + }
> +
> + my $daemons_file = "/etc/frr/daemons";
> +
> + my $old_config = PVE::Tools::file_get_contents($daemons_file);
> + my $new_config = "";
> +
> + my @lines = split(/\n/, $old_config);
> +
> + for my $line (@lines) {
so we have three cases here
- line contains one of our daemons as key (=> set status)
- line contains something else as key (=> keep line as is)
- line contains no key but something else entirely (=> keep line as is)
I think this could be structured so that it is a bit more readable/easy
to follow along..
first, fill in the defaults if needed:
if ($set_default) {
for my $daemon (keys %$SDN_DAEMONS_DEFAULT) {
$daemon_status->{$daemon} = $SDN_DAEMONS_DEFAULT->{$daemon}
if !defined($daemon_status->{$daemon});
}
}
and then simply override lines as needed:
for my $line (@lines) {
if ($line =~ m/^([a-z_]+)=/) {
my $key = $1;
my $status = $daemon_status->{$key};
if (defined($status)) {
my $value = status ? "yes" : "no";
$line = "$key=$value";
}
}
$new_config .= "$line\n";
}
> + if ($line =~ m/^([a-z_]+)=/) {
> + my $key = $1;
> +
> + my $status = $daemon_status->{$key};
> + $status = $SDN_DAEMONS_DEFAULT->{$key} if !defined $status && $set_default;
> +
> + if (defined $status) {
> + my $value = $status ? "yes" : "no";
> + $new_config .= "$key=$value\n";
> + next;
> + }
> + }
> +
> + $new_config .= "$line\n";
> + }
> +
> + PVE::Tools::file_set_contents($daemons_file, $new_config);
> +}
> +
> =head3 to_raw_config(\%frr_config)
>
> Converts a given C<\%frr_config> to the raw config format.
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper
2025-04-02 10:41 ` Fabian Grünbichler
@ 2025-04-02 10:50 ` Stefan Hanreich
0 siblings, 0 replies; 97+ messages in thread
From: Stefan Hanreich @ 2025-04-02 10:50 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
On 4/2/25 12:41, Fabian Grünbichler wrote:
> On March 28, 2025 6:13 pm, Gabriel Goller wrote:
>> From: Stefan Hanreich <s.hanreich@proxmox.com>
>>
>> Add functions that allow reading and manipulating values in the
>> /etc/frr/daemons file. We need this for en/disabling daemons depending
>> on which fabric types are configured. We only enable daemons which are
>> required for the configured fabrics. If a daemon is enabled but a
>> fabric gets deleted, we disable them.
>>
>> The helper works by iterating over the lines of the daemons file from
>> FRR, parsing the key and checking if the key is managed by the SDN
>> configuration, then sets it. As a safeguard, keys that can be changed
>> by SDN have to be explicitly configured in the respective hash of the
>> Frr module.
>>
>> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
>> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
>> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
>> ---
>> src/PVE/Network/SDN.pm | 15 +++++++++++
>> src/PVE/Network/SDN/Fabrics.pm | 18 +++++++++++++
>> src/PVE/Network/SDN/Frr.pm | 49 ++++++++++++++++++++++++++++++++++
>> 3 files changed, 82 insertions(+)
>>
>> diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
>> index b777a098a987..a0b61275e10b 100644
>> --- a/src/PVE/Network/SDN.pm
>> +++ b/src/PVE/Network/SDN.pm
>> @@ -258,12 +258,27 @@ sub generate_frr_raw_config {
>> return $raw_config;
>> }
>>
>> +=head3 get_frr_daemon_status(\%running_config, \%fabric_config)
>> +
>> +Returns a hash that indicates the status of the FRR daemons managed by SDN.
>> +
>> +=cut
>> +
>> +sub get_frr_daemon_status {
>> + my ($running_config, $fabric_config) = @_;
>> +
>> + return PVE::Network::SDN::Fabrics::get_frr_daemon_status($fabric_config);
>
> this takes but doesn't use the $running_config.. is this intentional?
>
Yes, the idea was that we move handling of BGP and other daemons into
this function in the future as well (where we need the running config)
and this preserves the order of function parameters that is used in
other functions. I guess it's a bit premature and it wouldn't be hard to
change when tacking this on, so no hard feelings against dropping this.
>> +}
>> +
>> sub generate_frr_config {
>> my ($reload) = @_;
>>
>> my $running_config = PVE::Network::SDN::running_config();
>> my $fabric_config = PVE::Network::SDN::Fabrics::config(1);
>>
>> + my $daemon_status = PVE::Network::SDN::get_frr_daemon_status($running_config, $fabric_config);
>
> the getter has a top-level wrapper
>
>> + PVE::Network::SDN::Frr::set_daemon_status($daemon_status);
>
> but the setter doesn't? seems inconsistent ;)
>
The idea here was that the SDN module is responsible for generating the
daemon status, but the FRR module is responsible for actually writing
it. I have nothing against adding a respective helper to the SDN module
though.
>> +
>> my $raw_config = PVE::Network::SDN::generate_frr_raw_config($running_config, $fabric_config);
>> PVE::Network::SDN::Frr::write_raw_config($raw_config);
>>
>> diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
>> index 6e3fa5234a5b..d716c68feac4 100644
>> --- a/src/PVE/Network/SDN/Fabrics.pm
>> +++ b/src/PVE/Network/SDN/Fabrics.pm
>> @@ -69,6 +69,24 @@ sub config_for_protocol {
>> return $module->config($section_config);
>> }
>>
>> +sub get_frr_daemon_status {
>> + my ($fabric_config) = @_;
>> +
>> + my $daemon_status = {};
>> + my $nodename = PVE::INotify::nodename();
>> +
>> + for my $protocol (sort keys %$fabric_config) {
>> + my $config = $fabric_config->{$protocol};
>
> this could iterate over the values instead? ;)
will do
>> + my $enabled_daemons = $config->enabled_daemons($nodename);
>> +
>> + for my $daemon (@$enabled_daemons) {
>> + $daemon_status->{$daemon} = 1;
>> + }
>> + }
>> +
>> + return $daemon_status;
>> +}
>> +
>> sub generate_frr_raw_config {
>> my ($fabric_config) = @_;
>>
>> diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
>> index bb0f197d8dea..9ae302a9c25f 100644
>> --- a/src/PVE/Network/SDN/Frr.pm
>> +++ b/src/PVE/Network/SDN/Frr.pm
>> @@ -77,6 +77,55 @@ sub reload {
>> }
>> }
>>
>> +my $SDN_DAEMONS_DEFAULT = {
>> + ospfd => 0,
>> + fabricd => 0,
>> +};
>> +
>> +=head3 set_daemon_status(\%daemons, $set_default)
>> +
>> +Sets the status of all daemons supplied in C<\%daemons>. This only works for
>> +daemons managed by SDN, as indicated in the C<$SDN_DAEMONS_DEFAULT> constant. If
>> +a daemon is supplied that isn't managed by SDN then this command will fail. If
>> +C<$set_default> is set, then additionally all sdn-managed daemons that are
>> +missing in C<\%daemons> are reset to their default value.
>> +
>> +=cut
>> +
>> +sub set_daemon_status {
>> + my ($daemon_status, $set_default) = @_;
>> +
>> + for my $daemon (keys %$daemon_status) {
>> + die "$daemon is not SDN managed" if !defined $SDN_DAEMONS_DEFAULT->{$daemon};
>> + }
>> +
>> + my $daemons_file = "/etc/frr/daemons";
>> +
>> + my $old_config = PVE::Tools::file_get_contents($daemons_file);
>> + my $new_config = "";
>> +
>> + my @lines = split(/\n/, $old_config);
>> +
>> + for my $line (@lines) {
>
> so we have three cases here
> - line contains one of our daemons as key (=> set status)
> - line contains something else as key (=> keep line as is)
> - line contains no key but something else entirely (=> keep line as is)
>
> I think this could be structured so that it is a bit more readable/easy
> to follow along..
>
> first, fill in the defaults if needed:
>
> if ($set_default) {
> for my $daemon (keys %$SDN_DAEMONS_DEFAULT) {
> $daemon_status->{$daemon} = $SDN_DAEMONS_DEFAULT->{$daemon}
> if !defined($daemon_status->{$daemon});
> }
> }
>
> and then simply override lines as needed:
>
> for my $line (@lines) {
> if ($line =~ m/^([a-z_]+)=/) {
> my $key = $1;
> my $status = $daemon_status->{$key};
>
> if (defined($status)) {
> my $value = status ? "yes" : "no";
> $line = "$key=$value";
> }
> }
>
> $new_config .= "$line\n";
> }
>
makes sense, will convert!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (34 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:41 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 10/17] fabrics: generate ifupdown configuration Gabriel Goller
` (17 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Save the fabrics configuration in the running configuration, when
applying the SDN configuration. This causes the FRR configuration to
be actually generated for the openfabric and ospf plugins, since the
FRR configuration is generated from the running configuration.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN.pm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index a0b61275e10b..12f0f9361389 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -155,13 +155,19 @@ sub commit_config {
my $zones_cfg = PVE::Network::SDN::Zones::config();
my $controllers_cfg = PVE::Network::SDN::Controllers::config();
my $subnets_cfg = PVE::Network::SDN::Subnets::config();
+ my $openfabric_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("openfabric")
+ ->get_inner();
+ my $ospf_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("ospf")
+ ->get_inner();
my $vnets = { ids => $vnets_cfg->{ids} };
my $zones = { ids => $zones_cfg->{ids} };
my $controllers = { ids => $controllers_cfg->{ids} };
my $subnets = { ids => $subnets_cfg->{ids} };
+ my $openfabric = { ids => $openfabric_cfg };
+ my $ospf = { ids => $ospf_cfg };
- $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets };
+ $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets, openfabric => $openfabric, ospf => $ospf };
cfs_write_file($running_cfg, $cfg);
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config Gabriel Goller
@ 2025-04-02 10:41 ` Fabian Grünbichler
2025-04-02 12:26 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:41 UTC (permalink / raw)
To: Proxmox VE development discussion
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Save the fabrics configuration in the running configuration, when
> applying the SDN configuration. This causes the FRR configuration to
> be actually generated for the openfabric and ospf plugins, since the
> FRR configuration is generated from the running configuration.
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/Network/SDN.pm | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
> index a0b61275e10b..12f0f9361389 100644
> --- a/src/PVE/Network/SDN.pm
> +++ b/src/PVE/Network/SDN.pm
> @@ -155,13 +155,19 @@ sub commit_config {
> my $zones_cfg = PVE::Network::SDN::Zones::config();
> my $controllers_cfg = PVE::Network::SDN::Controllers::config();
> my $subnets_cfg = PVE::Network::SDN::Subnets::config();
> + my $openfabric_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("openfabric")
> + ->get_inner();
> + my $ospf_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("ospf")
> + ->get_inner();
>
> my $vnets = { ids => $vnets_cfg->{ids} };
> my $zones = { ids => $zones_cfg->{ids} };
> my $controllers = { ids => $controllers_cfg->{ids} };
> my $subnets = { ids => $subnets_cfg->{ids} };
> + my $openfabric = { ids => $openfabric_cfg };
> + my $ospf = { ids => $ospf_cfg };
>
> - $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets };
> + $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets, openfabric => $openfabric, ospf => $ospf };
wouldn't it be more in line to have fabrics => fabrics_config here?
>
> cfs_write_file($running_cfg, $cfg);
> }
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing listZZ
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config
2025-04-02 10:41 ` Fabian Grünbichler
@ 2025-04-02 12:26 ` Stefan Hanreich
0 siblings, 0 replies; 97+ messages in thread
From: Stefan Hanreich @ 2025-04-02 12:26 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
On 4/2/25 12:41, Fabian Grünbichler wrote:
> On March 28, 2025 6:13 pm, Gabriel Goller wrote:
>> From: Stefan Hanreich <s.hanreich@proxmox.com>
>>
>> Save the fabrics configuration in the running configuration, when
>> applying the SDN configuration. This causes the FRR configuration to
>> be actually generated for the openfabric and ospf plugins, since the
>> FRR configuration is generated from the running configuration.
>>
>> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
>> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
>> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
>> ---
>> src/PVE/Network/SDN.pm | 8 +++++++-
>> 1 file changed, 7 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
>> index a0b61275e10b..12f0f9361389 100644
>> --- a/src/PVE/Network/SDN.pm
>> +++ b/src/PVE/Network/SDN.pm
>> @@ -155,13 +155,19 @@ sub commit_config {
>> my $zones_cfg = PVE::Network::SDN::Zones::config();
>> my $controllers_cfg = PVE::Network::SDN::Controllers::config();
>> my $subnets_cfg = PVE::Network::SDN::Subnets::config();
>> + my $openfabric_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("openfabric")
>> + ->get_inner();
>> + my $ospf_cfg = PVE::Network::SDN::Fabrics::config_for_protocol("ospf")
>> + ->get_inner();
>>
>> my $vnets = { ids => $vnets_cfg->{ids} };
>> my $zones = { ids => $zones_cfg->{ids} };
>> my $controllers = { ids => $controllers_cfg->{ids} };
>> my $subnets = { ids => $subnets_cfg->{ids} };
>> + my $openfabric = { ids => $openfabric_cfg };
>> + my $ospf = { ids => $ospf_cfg };
>>
>> - $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets };
>> + $cfg = { version => $version, vnets => $vnets, zones => $zones, controllers => $controllers, subnets => $subnets, openfabric => $openfabric, ospf => $ospf };
>
> wouldn't it be more in line to have fabrics => fabrics_config here?
Yes, probably makes more sense. The initial idea was to stick to the one
key / file pattern, but for the fabrics it probably makes more sense to
have them contained in a top-level key. Will change.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-network 10/17] fabrics: generate ifupdown configuration
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (35 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder Gabriel Goller
` (16 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Currently, the ifupdown generation is handled solely by the zones
plugin. Since the fabrics need to generate ifupdown configuration as
well, we create a new helper in the SDN module. It then in turn calls
into the zone and fabrics plugin, and merges the generated raw
configuration before writing it to the /etc/network/interfaces.d/sdn
file.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN.pm | 68 ++++++++++++++++++++++++++++------
src/PVE/Network/SDN/Fabrics.pm | 14 +++++++
src/PVE/Network/SDN/Zones.pm | 10 -----
src/test/run_test_zones.pl | 2 +-
4 files changed, 71 insertions(+), 23 deletions(-)
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index 12f0f9361389..24879dc0e76a 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -220,18 +220,62 @@ sub get_local_vnets {
return $vnets;
}
-sub generate_zone_config {
- my $raw_config = PVE::Network::SDN::Zones::generate_etc_network_config();
- if ($raw_config) {
- eval {
- my $net_cfg = PVE::INotify::read_file('interfaces', 1);
- my $opts = $net_cfg->{data}->{options};
- log_warn("missing 'source /etc/network/interfaces.d/sdn' directive for SDN support!\n")
- if ! grep { $_->[1] =~ m!^source /etc/network/interfaces.d/(:?sdn|\*)! } @$opts;
- };
- log_warn("Failed to read network interfaces definition - $@") if $@;
- }
- PVE::Network::SDN::Zones::write_etc_network_config($raw_config);
+=head3 generate_raw_etc_network_config()
+
+Generate the /etc/network/interfaces.d/sdn config file from the Zones
+and Fabrics configuration and return it as a String.
+
+=cut
+
+sub generate_raw_etc_network_config {
+ my $raw_config = "";
+
+ my $zone_config = PVE::Network::SDN::Zones::generate_etc_network_config();
+ $raw_config .= $zone_config if $zone_config;
+
+ my $fabric_config = PVE::Network::SDN::Fabrics::generate_etc_network_config();
+ $raw_config .= $fabric_config if $fabric_config;
+
+ return $raw_config;
+}
+
+=head3 ⋅write_raw_etc_network_config($raw_config)
+
+Writes a network configuration as generated by C<generate_raw_etc_network_config>
+to /etc/network/interfaces.d/sdn.
+
+=cut
+
+sub write_raw_etc_network_config {
+ my ($raw_config) = @_;
+ my $local_network_sdn_file = "/etc/network/interfaces.d/sdn";
+
+ die "no network config supplied" if !defined $raw_config;
+
+ eval {
+ my $net_cfg = PVE::INotify::read_file('interfaces', 1);
+ my $opts = $net_cfg->{data}->{options};
+ log_warn("missing 'source /etc/network/interfaces.d/sdn' directive for SDN support!\n")
+ if ! grep { $_->[1] =~ m!^source /etc/network/interfaces.d/(:?sdn|\*)! } @$opts;
+ };
+
+ log_warn("Failed to read network interfaces definition - $@") if $@;
+
+ my $writefh = IO::File->new($local_network_sdn_file,">");
+ print $writefh $raw_config;
+ $writefh->close();
+}
+
+=head3 ⋅generate_etc_network_config()
+
+Generates the network configuration for all SDN plugins and writes it to the SDN
+interfaces files (/etc/network/interfaces.d/sdn).
+
+=cut
+
+sub generate_etc_network_config {
+ my $raw_config = PVE::Network::SDN::generate_raw_etc_network_config();
+ PVE::Network::SDN::write_raw_etc_network_config($raw_config);
}
=head3 generate_frr_raw_config(\%running_config, \%fabric_config)
diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
index d716c68feac4..05336a5730ac 100644
--- a/src/PVE/Network/SDN/Fabrics.pm
+++ b/src/PVE/Network/SDN/Fabrics.pm
@@ -102,6 +102,20 @@ sub generate_frr_raw_config {
return \@raw_config;
}
+sub generate_etc_network_config {
+ my $nodename = PVE::INotify::nodename();
+
+ my $fabric_config = PVE::Network::SDN::Fabrics::config(1);
+
+ my $raw_config = "";
+ for my $protocol (sort keys %$fabric_config) {
+ my $protocol_config = $fabric_config->{$protocol};
+ $raw_config .= $protocol_config->get_interfaces_etc_network_config($nodename);
+ }
+
+ return $raw_config;
+}
+
sub write_config {
my ($config) = @_;
diff --git a/src/PVE/Network/SDN/Zones.pm b/src/PVE/Network/SDN/Zones.pm
index c1c7745f894e..131ca5ea136d 100644
--- a/src/PVE/Network/SDN/Zones.pm
+++ b/src/PVE/Network/SDN/Zones.pm
@@ -168,16 +168,6 @@ sub generate_etc_network_config {
return $raw_network_config;
}
-sub write_etc_network_config {
- my ($rawconfig) = @_;
-
- return if !$rawconfig;
-
- my $writefh = IO::File->new($local_network_sdn_file,">");
- print $writefh $rawconfig;
- $writefh->close();
-}
-
sub read_etc_network_config_version {
my $versionstr = PVE::Tools::file_read_firstline($local_network_sdn_file);
diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl
index 4137da6b2687..794cbdb1d12b 100755
--- a/src/test/run_test_zones.pl
+++ b/src/test/run_test_zones.pl
@@ -129,7 +129,7 @@ foreach my $test (@tests) {
my $name = $test;
my $expected = read_file("./$test/expected_sdn_interfaces");
- my $result = eval { PVE::Network::SDN::Zones::generate_etc_network_config() };
+ my $result = eval { PVE::Network::SDN::generate_raw_etc_network_config() };
if (my $err = $@) {
diag("got unexpected error - $err");
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (36 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 10/17] fabrics: generate ifupdown configuration Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:41 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 12/17] api: fabrics: add common helpers Gabriel Goller
` (15 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Add a new subfolder that contains the API methods for the sdn
fabrics. We also add a method for listing all fabrics of all types as
a GET endpoint, with the respective schemas. It supports the same
filtering options as the other SDN GET endpoints (pending / running).
We also need to add a special case in encode_value for the interface
key of nodes, since they require special handling when encoding
because they are arrays.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/API2/Network/SDN.pm | 7 +
src/PVE/API2/Network/SDN/Fabrics.pm | 294 ++++++++++++++++++++++++++++
src/PVE/API2/Network/SDN/Makefile | 2 +-
src/PVE/Network/SDN.pm | 2 +-
4 files changed, 303 insertions(+), 2 deletions(-)
create mode 100644 src/PVE/API2/Network/SDN/Fabrics.pm
diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm
index d216e4878b61..ccbf0777e3d4 100644
--- a/src/PVE/API2/Network/SDN.pm
+++ b/src/PVE/API2/Network/SDN.pm
@@ -17,6 +17,7 @@ use PVE::API2::Network::SDN::Vnets;
use PVE::API2::Network::SDN::Zones;
use PVE::API2::Network::SDN::Ipams;
use PVE::API2::Network::SDN::Dns;
+use PVE::API2::Network::SDN::Fabrics;
use base qw(PVE::RESTHandler);
@@ -45,6 +46,11 @@ __PACKAGE__->register_method ({
path => 'dns',
});
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Network::SDN::Fabrics",
+ path => 'fabrics',
+});
+
__PACKAGE__->register_method({
name => 'index',
path => '',
@@ -76,6 +82,7 @@ __PACKAGE__->register_method({
{ id => 'controllers' },
{ id => 'ipams' },
{ id => 'dns' },
+ { id => 'fabrics' },
];
return $res;
diff --git a/src/PVE/API2/Network/SDN/Fabrics.pm b/src/PVE/API2/Network/SDN/Fabrics.pm
new file mode 100644
index 000000000000..c9064b0ea05b
--- /dev/null
+++ b/src/PVE/API2/Network/SDN/Fabrics.pm
@@ -0,0 +1,294 @@
+package PVE::API2::Network::SDN::Fabrics;
+
+use strict;
+use warnings;
+
+use Storable qw(dclone);
+
+use PVE::RPCEnvironment;
+use PVE::Tools qw(extract_param);
+
+use PVE::API2::Network::SDN::Fabrics::OpenFabric;
+use PVE::API2::Network::SDN::Fabrics::Ospf;
+
+use PVE::Network::SDN::Fabrics;
+
+use PVE::RESTHandler;
+use base qw(PVE::RESTHandler);
+
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Network::SDN::Fabrics::OpenFabric",
+ path => 'openfabric',
+});
+__PACKAGE__->register_method ({
+ subclass => "PVE::API2::Network::SDN::Fabrics::Ospf",
+ path => 'ospf',
+});
+
+my $openfabric_interface_fmt = {
+ name => {
+ type => 'string',
+ description => 'Name of the interface',
+ },
+ ip => {
+ type => 'string',
+ description => 'The IPv4 address of the interface',
+ optional => 1,
+ },
+ ipv6 => {
+ type => 'string',
+ description => 'The IPv6 address of the interface',
+ optional => 1,
+ },
+ passive => {
+ type => 'boolean',
+ description => 'The passive property of the interface',
+ optional => 1,
+ },
+ hello_interval => {
+ type => 'number',
+ description => 'The hello_interval property of the interface',
+ optional => 1,
+ },
+ csnp_interval => {
+ type => 'number',
+ description => 'The csnp_interval property of the interface',
+ optional => 1,
+ },
+ hello_multiplier => {
+ type => 'number',
+ description => 'The hello_multiplier property of the interface',
+ optional => 1,
+ },
+};
+
+PVE::JSONSchema::register_format('pve-sdn-openfabric-interface', $openfabric_interface_fmt);
+
+my $ospf_interface_fmt = {
+ name => {
+ type => 'string',
+ description => 'Name of the interface',
+ },
+ passive => {
+ type => 'boolean',
+ description => 'The passive property of the interface',
+ optional => 1,
+ },
+ ip => {
+ type => 'string',
+ description => 'The IPv4 address of the interface',
+ optional => 1,
+ },
+ unnumbered => {
+ type => 'boolean',
+ description => 'If the interface is unnumbered',
+ optional => 1,
+ },
+};
+
+PVE::JSONSchema::register_format('pve-sdn-ospf-interface', $ospf_interface_fmt);
+
+__PACKAGE__->register_method({
+ name => 'index',
+ path => '',
+ method => 'GET',
+ description => 'Index of SDN Fabrics',
+ permissions => {
+ description => "Only list entries where you have 'SDN.Audit' or 'SDN.Allocate' permissions on '/sdn/fabrics/<protocol>/<fabric>'",
+ user => 'all',
+ },
+ parameters => {
+ additionalProperties => 0,
+ properties => {
+ running => {
+ type => 'boolean',
+ optional => 1,
+ description => "Display running config.",
+ },
+ pending => {
+ type => 'boolean',
+ optional => 1,
+ description => "Display pending config.",
+ },
+ },
+ },
+ returns => {
+ type => 'object',
+ properties => {
+ openfabric => {
+ type => 'array',
+ items => {
+ type => 'object',
+ properties => {
+ name => {
+ type => 'string',
+ description => 'Id of the fabric'
+ },
+ 'type' => {
+ type => 'string',
+ description => 'What type of config is this',
+ },
+ 'config' => {
+ type => 'object',
+ 'type-property' => 'type',
+ oneOf => [
+ {
+ 'instance-types' => ['node'],
+ type => 'object',
+ description => 'Node config',
+ properties => {
+ node => {
+ type => 'object',
+ properties => {
+ net => {
+ type => 'string',
+ description => 'The NET (Network Entity Title) of this node',
+ },
+ loopback_prefix => {
+ type => 'string',
+ description => 'The IP prefix for Loopback IPs',
+ },
+ interface => {
+ type => 'array',
+ description => 'The OpenFabric interfaces on this node',
+ items => {
+ type => 'string',
+ description => 'OpenFabric interface',
+ format => 'pve-sdn-openfabric-interface'
+ },
+ },
+ },
+ },
+ },
+ },
+ {
+ 'instance-types' => ['fabric'],
+ type => 'object',
+ description => 'Fabric config',
+ properties => {
+ fabric => {
+ type => 'object',
+ properties => {
+ loopback_prefix => {
+ type => 'string',
+ description => 'The IP prefix for Loopback IPs',
+ },
+ hello_interval => {
+ type => 'integer',
+ optional => 1,
+ description => 'The global hello_interval parameter in seconds that will be set on every interface',
+ },
+ },
+ },
+ },
+ }
+ ],
+ },
+ },
+ },
+ },
+ ospf => {
+ type => 'array',
+ items => {
+ type => 'object',
+ properties => {
+ name => {
+ type => 'string',
+ description => 'Id of the fabric'
+ },
+ config => {
+ type => 'object',
+ 'type-property' => 'type',
+ oneOf => [
+ {
+ 'instance-types' => [ 'node' ],
+ type => 'object',
+ description => 'Node config',
+ properties => {
+ node => {
+ type => 'object',
+ properties => {
+ router_id => {
+ type => 'string',
+ description => 'The Router ID of this node',
+ },
+ interface => {
+ type => 'array',
+ description => 'The OSPF interfaces on this node',
+ items => {
+ type => 'string',
+ description => 'OSPF interface',
+ format => 'pve-sdn-ospf-interface',
+ },
+ },
+ },
+ },
+ },
+ },
+ {
+ 'instance-types' => [ 'fabric' ],
+ type => 'object',
+ description => 'Fabric config',
+ properties => {
+ fabric => {
+ type => 'object',
+ },
+ },
+ }
+ ]
+ },
+ },
+ },
+ },
+ },
+ },
+ code => sub {
+ my ($param) = @_;
+ my $rpcenv = PVE::RPCEnvironment::get();
+
+ my $running = extract_param($param, 'running');
+ my $pending = extract_param($param, 'pending');
+
+ my $fabric_config = PVE::Network::SDN::Fabrics::config();
+ my $running_config = PVE::Network::SDN::running_config();
+ my $config;
+
+ my $authuser = $rpcenv->get_user();
+ my $privs = [ 'SDN.Audit', 'SDN.Allocate' ];
+
+ my $res = {};
+ foreach my $protocol (keys %$fabric_config) {
+ $res->{$protocol} = [];
+
+ if ($pending) {
+ # pending_config expects the section config to be under the ids
+ # key, but get_inner() returns it without that key
+ my $section_config = {
+ ids => $fabric_config->{$protocol}->get_inner(),
+ };
+
+ $config = PVE::Network::SDN::pending_config(
+ $running_config,
+ $section_config,
+ $protocol
+ );
+
+ $config = $config->{ids};
+ } elsif ($running) {
+ $config = $running_config->{$protocol}->{ids};
+ } else {
+ $config = $fabric_config->{$protocol}->get_inner();
+ }
+
+ foreach my $id (sort keys %$config) {
+ my $entry = $config->{$id};
+ next if !$rpcenv->check_any($authuser, "/sdn/fabrics/$protocol/$entry->{name}", $privs, 1);
+
+ push @{$res->{$protocol}}, dclone($entry);
+ }
+ }
+ return $res;
+ },
+});
+
+1;
diff --git a/src/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile
index abd1bfae020e..4dbb6c92fd82 100644
--- a/src/PVE/API2/Network/SDN/Makefile
+++ b/src/PVE/API2/Network/SDN/Makefile
@@ -1,4 +1,4 @@
-SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm Ips.pm
+SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm Ips.pm Fabrics.pm
PERL5DIR=${DESTDIR}/usr/share/perl5
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index 24879dc0e76a..b35767b667b4 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -344,7 +344,7 @@ sub generate_dhcp_config {
sub encode_value {
my ($type, $key, $value) = @_;
- if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range') {
+ if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range' || $key eq 'interface') {
if (ref($value) eq 'HASH') {
return join(',', sort keys(%$value));
} elsif (ref($value) eq 'ARRAY') {
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder Gabriel Goller
@ 2025-04-02 10:41 ` Fabian Grünbichler
2025-04-02 12:20 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:41 UTC (permalink / raw)
To: Proxmox VE development discussion
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Add a new subfolder that contains the API methods for the sdn
> fabrics. We also add a method for listing all fabrics of all types as
> a GET endpoint, with the respective schemas. It supports the same
> filtering options as the other SDN GET endpoints (pending / running).
>
> We also need to add a special case in encode_value for the interface
> key of nodes, since they require special handling when encoding
> because they are arrays.
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/API2/Network/SDN.pm | 7 +
> src/PVE/API2/Network/SDN/Fabrics.pm | 294 ++++++++++++++++++++++++++++
> src/PVE/API2/Network/SDN/Makefile | 2 +-
> src/PVE/Network/SDN.pm | 2 +-
> 4 files changed, 303 insertions(+), 2 deletions(-)
> create mode 100644 src/PVE/API2/Network/SDN/Fabrics.pm
>
> diff --git a/src/PVE/API2/Network/SDN.pm b/src/PVE/API2/Network/SDN.pm
> index d216e4878b61..ccbf0777e3d4 100644
> --- a/src/PVE/API2/Network/SDN.pm
> +++ b/src/PVE/API2/Network/SDN.pm
> @@ -17,6 +17,7 @@ use PVE::API2::Network::SDN::Vnets;
> use PVE::API2::Network::SDN::Zones;
> use PVE::API2::Network::SDN::Ipams;
> use PVE::API2::Network::SDN::Dns;
> +use PVE::API2::Network::SDN::Fabrics;
>
> use base qw(PVE::RESTHandler);
>
> @@ -45,6 +46,11 @@ __PACKAGE__->register_method ({
> path => 'dns',
> });
>
> +__PACKAGE__->register_method ({
> + subclass => "PVE::API2::Network::SDN::Fabrics",
> + path => 'fabrics',
> +});
> +
> __PACKAGE__->register_method({
> name => 'index',
> path => '',
> @@ -76,6 +82,7 @@ __PACKAGE__->register_method({
> { id => 'controllers' },
> { id => 'ipams' },
> { id => 'dns' },
> + { id => 'fabrics' },
> ];
>
> return $res;
> diff --git a/src/PVE/API2/Network/SDN/Fabrics.pm b/src/PVE/API2/Network/SDN/Fabrics.pm
> new file mode 100644
> index 000000000000..c9064b0ea05b
> --- /dev/null
> +++ b/src/PVE/API2/Network/SDN/Fabrics.pm
> @@ -0,0 +1,294 @@
> +package PVE::API2::Network::SDN::Fabrics;
> +
> +use strict;
> +use warnings;
> +
> +use Storable qw(dclone);
> +
> +use PVE::RPCEnvironment;
> +use PVE::Tools qw(extract_param);
> +
> +use PVE::API2::Network::SDN::Fabrics::OpenFabric;
> +use PVE::API2::Network::SDN::Fabrics::Ospf;
> +
> +use PVE::Network::SDN::Fabrics;
> +
> +use PVE::RESTHandler;
> +use base qw(PVE::RESTHandler);
> +
> +__PACKAGE__->register_method ({
> + subclass => "PVE::API2::Network::SDN::Fabrics::OpenFabric",
> + path => 'openfabric',
> +});
> +__PACKAGE__->register_method ({
> + subclass => "PVE::API2::Network::SDN::Fabrics::Ospf",
> + path => 'ospf',
> +});
> +
> +my $openfabric_interface_fmt = {
> + name => {
> + type => 'string',
> + description => 'Name of the interface',
string without format
> + },
> + ip => {
> + type => 'string',
> + description => 'The IPv4 address of the interface',
string without format
> + optional => 1,
> + },
> + ipv6 => {
> + type => 'string',
> + description => 'The IPv6 address of the interface',
string without format
> + optional => 1,
> + },
> + passive => {
> + type => 'boolean',
> + description => 'The passive property of the interface',
> + optional => 1,
> + },
> + hello_interval => {
> + type => 'number',
> + description => 'The hello_interval property of the interface',
> + optional => 1,
> + },
> + csnp_interval => {
> + type => 'number',
> + description => 'The csnp_interval property of the interface',
> + optional => 1,
> + },
> + hello_multiplier => {
> + type => 'number',
> + description => 'The hello_multiplier property of the interface',
> + optional => 1,
> + },
not sure whether these have min/max values?
> +};
> +
> +PVE::JSONSchema::register_format('pve-sdn-openfabric-interface', $openfabric_interface_fmt);
> +
> +my $ospf_interface_fmt = {
> + name => {
> + type => 'string',
> + description => 'Name of the interface',
string without format
> + },
> + passive => {
> + type => 'boolean',
> + description => 'The passive property of the interface',
> + optional => 1,
> + },
> + ip => {
> + type => 'string',
> + description => 'The IPv4 address of the interface',
string without format
> + optional => 1,
> + },
> + unnumbered => {
> + type => 'boolean',
> + description => 'If the interface is unnumbered',
> + optional => 1,
> + },
> +};
> +
> +PVE::JSONSchema::register_format('pve-sdn-ospf-interface', $ospf_interface_fmt);
> +
> +__PACKAGE__->register_method({
> + name => 'index',
> + path => '',
> + method => 'GET',
> + description => 'Index of SDN Fabrics',
> + permissions => {
> + description => "Only list entries where you have 'SDN.Audit' or 'SDN.Allocate' permissions on '/sdn/fabrics/<protocol>/<fabric>'",
> + user => 'all',
> + },
> + parameters => {
> + additionalProperties => 0,
> + properties => {
> + running => {
> + type => 'boolean',
> + optional => 1,
> + description => "Display running config.",
> + },
> + pending => {
> + type => 'boolean',
> + optional => 1,
> + description => "Display pending config.",
> + },
> + },
> + },
> + returns => {
> + type => 'object',
> + properties => {
> + openfabric => {
> + type => 'array',
> + items => {
> + type => 'object',
> + properties => {
> + name => {
> + type => 'string',
> + description => 'Id of the fabric'
> + },
> + 'type' => {
> + type => 'string',
> + description => 'What type of config is this',
> + },
> + 'config' => {
> + type => 'object',
> + 'type-property' => 'type',
> + oneOf => [
> + {
> + 'instance-types' => ['node'],
> + type => 'object',
> + description => 'Node config',
> + properties => {
> + node => {
> + type => 'object',
> + properties => {
> + net => {
> + type => 'string',
> + description => 'The NET (Network Entity Title) of this node',
> + },
> + loopback_prefix => {
> + type => 'string',
> + description => 'The IP prefix for Loopback IPs',
> + },
> + interface => {
> + type => 'array',
> + description => 'The OpenFabric interfaces on this node',
> + items => {
> + type => 'string',
> + description => 'OpenFabric interface',
> + format => 'pve-sdn-openfabric-interface'
> + },
> + },
> + },
> + },
> + },
> + },
> + {
> + 'instance-types' => ['fabric'],
> + type => 'object',
> + description => 'Fabric config',
> + properties => {
> + fabric => {
> + type => 'object',
> + properties => {
> + loopback_prefix => {
> + type => 'string',
> + description => 'The IP prefix for Loopback IPs',
> + },
> + hello_interval => {
> + type => 'integer',
> + optional => 1,
> + description => 'The global hello_interval parameter in seconds that will be set on every interface',
> + },
> + },
> + },
> + },
> + }
> + ],
> + },
> + },
> + },
> + },
> + ospf => {
> + type => 'array',
> + items => {
> + type => 'object',
> + properties => {
> + name => {
> + type => 'string',
> + description => 'Id of the fabric'
> + },
> + config => {
> + type => 'object',
> + 'type-property' => 'type',
> + oneOf => [
> + {
> + 'instance-types' => [ 'node' ],
> + type => 'object',
> + description => 'Node config',
> + properties => {
> + node => {
> + type => 'object',
> + properties => {
> + router_id => {
> + type => 'string',
> + description => 'The Router ID of this node',
> + },
> + interface => {
> + type => 'array',
> + description => 'The OSPF interfaces on this node',
> + items => {
> + type => 'string',
> + description => 'OSPF interface',
> + format => 'pve-sdn-ospf-interface',
> + },
> + },
> + },
> + },
> + },
> + },
> + {
> + 'instance-types' => [ 'fabric' ],
> + type => 'object',
> + description => 'Fabric config',
> + properties => {
> + fabric => {
> + type => 'object',
> + },
> + },
> + }
> + ]
> + },
> + },
> + },
> + },
> + },
> + },
> + code => sub {
> + my ($param) = @_;
> + my $rpcenv = PVE::RPCEnvironment::get();
> +
> + my $running = extract_param($param, 'running');
> + my $pending = extract_param($param, 'pending');
> +
> + my $fabric_config = PVE::Network::SDN::Fabrics::config();
> + my $running_config = PVE::Network::SDN::running_config();
> + my $config;
> +
> + my $authuser = $rpcenv->get_user();
> + my $privs = [ 'SDN.Audit', 'SDN.Allocate' ];
I wonder whether it would make sense to check whether there are any
privs below the /sdn/fabrics root here, and move the config loading
below that check, to avoid leaking things via error messages if
something is misconfigured?
also, doesn't this return quite a lot of information for an "index"
call that just requires SDN.Audit? it might make sense to filter the
information below based on whether we have Audit or Allocate privs?
> +
> + my $res = {};
> + foreach my $protocol (keys %$fabric_config) {
> + $res->{$protocol} = [];
> +
> + if ($pending) {
> + # pending_config expects the section config to be under the ids
> + # key, but get_inner() returns it without that key
> + my $section_config = {
> + ids => $fabric_config->{$protocol}->get_inner(),
> + };
> +
> + $config = PVE::Network::SDN::pending_config(
> + $running_config,
> + $section_config,
> + $protocol
> + );
> +
> + $config = $config->{ids};
> + } elsif ($running) {
> + $config = $running_config->{$protocol}->{ids};
> + } else {
> + $config = $fabric_config->{$protocol}->get_inner();
> + }
> +
> + foreach my $id (sort keys %$config) {
> + my $entry = $config->{$id};
> + next if !$rpcenv->check_any($authuser, "/sdn/fabrics/$protocol/$entry->{name}", $privs, 1);
this is a new ACL path, but it's not possible to configure it because
there is no pve-access-control patch allowing it - did you test the
permissions part? ;)
> +
> + push @{$res->{$protocol}}, dclone($entry);
> + }
> + }
> + return $res;
> + },
> +});
> +
> +1;
> diff --git a/src/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile
> index abd1bfae020e..4dbb6c92fd82 100644
> --- a/src/PVE/API2/Network/SDN/Makefile
> +++ b/src/PVE/API2/Network/SDN/Makefile
> @@ -1,4 +1,4 @@
> -SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm Ips.pm
> +SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm Ips.pm Fabrics.pm
>
>
> PERL5DIR=${DESTDIR}/usr/share/perl5
> diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
> index 24879dc0e76a..b35767b667b4 100644
> --- a/src/PVE/Network/SDN.pm
> +++ b/src/PVE/Network/SDN.pm
> @@ -344,7 +344,7 @@ sub generate_dhcp_config {
> sub encode_value {
> my ($type, $key, $value) = @_;
>
> - if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range') {
> + if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range' || $key eq 'interface') {
I hope this doesn't ever bite us, 'interface' (and 'nodes' for that matter) is quite generic..
> if (ref($value) eq 'HASH') {
> return join(',', sort keys(%$value));
> } elsif (ref($value) eq 'ARRAY') {
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder
2025-04-02 10:41 ` Fabian Grünbichler
@ 2025-04-02 12:20 ` Stefan Hanreich
2025-04-02 12:29 ` Fabian Grünbichler
0 siblings, 1 reply; 97+ messages in thread
From: Stefan Hanreich @ 2025-04-02 12:20 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
On 4/2/25 12:41, Fabian Grünbichler wrote:
>> + code => sub {
>> + my ($param) = @_;
>> + my $rpcenv = PVE::RPCEnvironment::get();
>> +
>> + my $running = extract_param($param, 'running');
>> + my $pending = extract_param($param, 'pending');
>> +
>> + my $fabric_config = PVE::Network::SDN::Fabrics::config();
>> + my $running_config = PVE::Network::SDN::running_config();
>> + my $config;
>> +
>> + my $authuser = $rpcenv->get_user();
>> + my $privs = [ 'SDN.Audit', 'SDN.Allocate' ];
>
> I wonder whether it would make sense to check whether there are any
> privs below the /sdn/fabrics root here, and move the config loading
> below that check, to avoid leaking things via error messages if
> something is misconfigured?
Yes, probably sensible to check for each protocol independently and only
start loading the configuration / filtering if the user has at least
some permissions for that protocol. We should then also eval everything
and return a generic error in case anything goes wrong - just to be sure?
> also, doesn't this return quite a lot of information for an "index"
> call that just requires SDN.Audit? it might make sense to filter the
> information below based on whether we have Audit or Allocate privs?
Wouldn't that be applicable for almost any SDN endpoint then? Audit has
always been read and Allocate modify. Not sure which properties we could
actually filter in the case of the user having only Audit permissions.
We decided against additionally introducing a host-level in the
permissions, because with a fabric spanning the whole cluster it doesn't
really make sense to have a partial view of only some nodes.
>> +
>> + my $res = {};
>> + foreach my $protocol (keys %$fabric_config) {
>> + $res->{$protocol} = [];
>> +
>> + if ($pending) {
>> + # pending_config expects the section config to be under the ids
>> + # key, but get_inner() returns it without that key
>> + my $section_config = {
>> + ids => $fabric_config->{$protocol}->get_inner(),
>> + };
>> +
>> + $config = PVE::Network::SDN::pending_config(
>> + $running_config,
>> + $section_config,
>> + $protocol
>> + );
>> +
>> + $config = $config->{ids};
>> + } elsif ($running) {
>> + $config = $running_config->{$protocol}->{ids};
>> + } else {
>> + $config = $fabric_config->{$protocol}->get_inner();
>> + }
>> +
>> + foreach my $id (sort keys %$config) {
>> + my $entry = $config->{$id};
>> + next if !$rpcenv->check_any($authuser, "/sdn/fabrics/$protocol/$entry->{name}", $privs, 1);
>
> this is a new ACL path, but it's not possible to configure it because
> there is no pve-access-control patch allowing it - did you test the
> permissions part? ;)
will be included in a follow-up - sorry!
>> +
>> + push @{$res->{$protocol}}, dclone($entry);
>> + }
>> + }
>> + return $res;
>> + },
>> +});
>> +
>> +1;
>> diff --git a/src/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile
>> index abd1bfae020e..4dbb6c92fd82 100644
>> --- a/src/PVE/API2/Network/SDN/Makefile
>> +++ b/src/PVE/API2/Network/SDN/Makefile
>> @@ -1,4 +1,4 @@
>> -SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm Ips.pm
>> +SOURCES=Vnets.pm Zones.pm Controllers.pm Subnets.pm Ipams.pm Dns.pm Ips.pm Fabrics.pm
>>
>>
>> PERL5DIR=${DESTDIR}/usr/share/perl5
>> diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
>> index 24879dc0e76a..b35767b667b4 100644
>> --- a/src/PVE/Network/SDN.pm
>> +++ b/src/PVE/Network/SDN.pm
>> @@ -344,7 +344,7 @@ sub generate_dhcp_config {
>> sub encode_value {
>> my ($type, $key, $value) = @_;
>>
>> - if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range') {
>> + if ($key eq 'nodes' || $key eq 'exitnodes' || $key eq 'dhcp-range' || $key eq 'interface') {
>
> I hope this doesn't ever bite us, 'interface' (and 'nodes' for that matter) is quite generic..
Yes, it's far from optimal - the whole pending_config / encode_value
could use some serious redoing imo.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder
2025-04-02 12:20 ` Stefan Hanreich
@ 2025-04-02 12:29 ` Fabian Grünbichler
0 siblings, 0 replies; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 12:29 UTC (permalink / raw)
To: Proxmox VE development discussion, Stefan Hanreich
On April 2, 2025 2:20 pm, Stefan Hanreich wrote:
>
>
> On 4/2/25 12:41, Fabian Grünbichler wrote:
>>> + code => sub {
>>> + my ($param) = @_;
>>> + my $rpcenv = PVE::RPCEnvironment::get();
>>> +
>>> + my $running = extract_param($param, 'running');
>>> + my $pending = extract_param($param, 'pending');
>>> +
>>> + my $fabric_config = PVE::Network::SDN::Fabrics::config();
>>> + my $running_config = PVE::Network::SDN::running_config();
>>> + my $config;
>>> +
>>> + my $authuser = $rpcenv->get_user();
>>> + my $privs = [ 'SDN.Audit', 'SDN.Allocate' ];
>>
>> I wonder whether it would make sense to check whether there are any
>> privs below the /sdn/fabrics root here, and move the config loading
>> below that check, to avoid leaking things via error messages if
>> something is misconfigured?
>
> Yes, probably sensible to check for each protocol independently and only
> start loading the configuration / filtering if the user has at least
> some permissions for that protocol. We should then also eval everything
> and return a generic error in case anything goes wrong - just to be sure?
>
>> also, doesn't this return quite a lot of information for an "index"
>> call that just requires SDN.Audit? it might make sense to filter the
>> information below based on whether we have Audit or Allocate privs?
>
> Wouldn't that be applicable for almost any SDN endpoint then? Audit has
> always been read and Allocate modify. Not sure which properties we could
> actually filter in the case of the user having only Audit permissions.
can be fine, the rest of the GET api calls only take allocate though ;)
> We decided against additionally introducing a host-level in the
> permissions, because with a fabric spanning the whole cluster it doesn't
> really make sense to have a partial view of only some nodes.
that's okay, we don't really have that many per-node ACL paths in
general..
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-network 12/17] api: fabrics: add common helpers
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (37 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:41 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 13/17] fabric: openfabric: add api endpoints Gabriel Goller
` (14 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Since the perlmod API for both the openfabric and ospf are the same,
add helpers for all CRUD operations that will be supported by the
openfabric and ospf endpoints, so they can share the same code.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/API2/Network/SDN/Fabrics/Common.pm | 80 ++++++++++++++++++++++
src/PVE/API2/Network/SDN/Fabrics/Makefile | 9 +++
2 files changed, 89 insertions(+)
create mode 100644 src/PVE/API2/Network/SDN/Fabrics/Common.pm
create mode 100644 src/PVE/API2/Network/SDN/Fabrics/Makefile
diff --git a/src/PVE/API2/Network/SDN/Fabrics/Common.pm b/src/PVE/API2/Network/SDN/Fabrics/Common.pm
new file mode 100644
index 000000000000..9d68264f6252
--- /dev/null
+++ b/src/PVE/API2/Network/SDN/Fabrics/Common.pm
@@ -0,0 +1,80 @@
+package PVE::API2::Network::SDN::Fabrics::Common;
+
+use strict;
+use warnings;
+
+use PVE::Network::SDN::Fabrics;
+
+sub delete_fabric {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ $fabrics->delete_fabric($param);
+ PVE::Network::SDN::Fabrics::write_config($fabrics);
+ return undef;
+}
+
+sub delete_node {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ $fabrics->delete_node($param);
+ PVE::Network::SDN::Fabrics::write_config($fabrics);
+ return undef;
+}
+
+sub add_node {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ $fabrics->add_node($param);
+ PVE::Network::SDN::Fabrics::write_config($fabrics);
+
+ return undef;
+}
+
+sub add_fabric {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ $fabrics->add_fabric($param);
+ PVE::Network::SDN::Fabrics::write_config($fabrics);
+
+ return undef;
+}
+
+sub get_fabric {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ my $return_value = $fabrics->get_fabric($param->{fabric});
+ return $return_value;
+}
+
+sub get_node {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ my $return_value = $fabrics->get_node($param->{fabric}, $param->{node});
+ return $return_value;
+}
+
+sub edit_fabric {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ $fabrics->edit_fabric($param);
+ PVE::Network::SDN::Fabrics::write_config($fabrics);
+ return undef;
+}
+
+sub edit_node {
+ my ($type, $param) = @_;
+
+ my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
+ $fabrics->edit_node($param);
+ PVE::Network::SDN::Fabrics::write_config($fabrics);
+ return undef;
+}
+
+1;
diff --git a/src/PVE/API2/Network/SDN/Fabrics/Makefile b/src/PVE/API2/Network/SDN/Fabrics/Makefile
new file mode 100644
index 000000000000..e433f2e7d0a6
--- /dev/null
+++ b/src/PVE/API2/Network/SDN/Fabrics/Makefile
@@ -0,0 +1,9 @@
+SOURCES=OpenFabric.pm Ospf.pm Common.pm
+
+
+PERL5DIR=${DESTDIR}/usr/share/perl5
+
+.PHONY: install
+install:
+ for i in ${SOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/PVE/API2/Network/SDN/Fabrics/$$i; done
+
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 12/17] api: fabrics: add common helpers
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 12/17] api: fabrics: add common helpers Gabriel Goller
@ 2025-04-02 10:41 ` Fabian Grünbichler
0 siblings, 0 replies; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:41 UTC (permalink / raw)
To: Proxmox VE development discussion
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Since the perlmod API for both the openfabric and ospf are the same,
> add helpers for all CRUD operations that will be supported by the
> openfabric and ospf endpoints, so they can share the same code.
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/API2/Network/SDN/Fabrics/Common.pm | 80 ++++++++++++++++++++++
> src/PVE/API2/Network/SDN/Fabrics/Makefile | 9 +++
> 2 files changed, 89 insertions(+)
> create mode 100644 src/PVE/API2/Network/SDN/Fabrics/Common.pm
> create mode 100644 src/PVE/API2/Network/SDN/Fabrics/Makefile
>
> diff --git a/src/PVE/API2/Network/SDN/Fabrics/Common.pm b/src/PVE/API2/Network/SDN/Fabrics/Common.pm
> new file mode 100644
> index 000000000000..9d68264f6252
> --- /dev/null
> +++ b/src/PVE/API2/Network/SDN/Fabrics/Common.pm
> @@ -0,0 +1,80 @@
> +package PVE::API2::Network::SDN::Fabrics::Common;
> +
> +use strict;
> +use warnings;
> +
> +use PVE::Network::SDN::Fabrics;
weird order: delete, add, get, edit ;)
> +
> +sub delete_fabric {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + $fabrics->delete_fabric($param);
> + PVE::Network::SDN::Fabrics::write_config($fabrics);
write_config is only called here in this module.. couldn't we just adapt
it to return undef instead of repeating it at every call site here..
and/or we could have a single do_action helper since we effectively
repeat the same code 6 times here..
and since these are basically the API handlers, we could add the missing
bits here and than just call them to handle the API request?
> + return undef;
> +}
> +
> +sub delete_node {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + $fabrics->delete_node($param);
> + PVE::Network::SDN::Fabrics::write_config($fabrics);
> + return undef;
> +}
> +
> +sub add_node {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + $fabrics->add_node($param);
> + PVE::Network::SDN::Fabrics::write_config($fabrics);
> +
> + return undef;
> +}
> +
> +sub add_fabric {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + $fabrics->add_fabric($param);
> + PVE::Network::SDN::Fabrics::write_config($fabrics);
> +
> + return undef;
> +}
> +
> +sub get_fabric {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + my $return_value = $fabrics->get_fabric($param->{fabric});
> + return $return_value;
this could just be
my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
return $fabrics->get_fabric($param->{fabric});
?
> +}
> +
> +sub get_node {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + my $return_value = $fabrics->get_node($param->{fabric}, $param->{node});
> + return $return_value;
same here
> +}
> +
> +sub edit_fabric {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + $fabrics->edit_fabric($param);
> + PVE::Network::SDN::Fabrics::write_config($fabrics);
> + return undef;
> +}
> +
> +sub edit_node {
> + my ($type, $param) = @_;
> +
> + my $fabrics = PVE::Network::SDN::Fabrics::config_for_protocol($type);
> + $fabrics->edit_node($param);
> + PVE::Network::SDN::Fabrics::write_config($fabrics);
> + return undef;
> +}
> +
> +1;
> diff --git a/src/PVE/API2/Network/SDN/Fabrics/Makefile b/src/PVE/API2/Network/SDN/Fabrics/Makefile
> new file mode 100644
> index 000000000000..e433f2e7d0a6
> --- /dev/null
> +++ b/src/PVE/API2/Network/SDN/Fabrics/Makefile
> @@ -0,0 +1,9 @@
> +SOURCES=OpenFabric.pm Ospf.pm Common.pm
> +
> +
> +PERL5DIR=${DESTDIR}/usr/share/perl5
> +
> +.PHONY: install
> +install:
> + for i in ${SOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/PVE/API2/Network/SDN/Fabrics/$$i; done
> +
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-network 13/17] fabric: openfabric: add api endpoints
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (38 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 12/17] api: fabrics: add common helpers Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:37 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 14/17] fabric: ospf: " Gabriel Goller
` (13 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Add CRUD endpoints for the openfabric fabric and node section types.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/API2/Network/SDN/Fabrics/Makefile | 2 +-
.../API2/Network/SDN/Fabrics/OpenFabric.pm | 348 ++++++++++++++++++
src/PVE/API2/Network/SDN/Makefile | 1 +
3 files changed, 350 insertions(+), 1 deletion(-)
create mode 100644 src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm
diff --git a/src/PVE/API2/Network/SDN/Fabrics/Makefile b/src/PVE/API2/Network/SDN/Fabrics/Makefile
index e433f2e7d0a6..8f7c630ef3ab 100644
--- a/src/PVE/API2/Network/SDN/Fabrics/Makefile
+++ b/src/PVE/API2/Network/SDN/Fabrics/Makefile
@@ -1,4 +1,4 @@
-SOURCES=OpenFabric.pm Ospf.pm Common.pm
+SOURCES=OpenFabric.pm Common.pm
PERL5DIR=${DESTDIR}/usr/share/perl5
diff --git a/src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm b/src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm
new file mode 100644
index 000000000000..fa5802f97ddf
--- /dev/null
+++ b/src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm
@@ -0,0 +1,348 @@
+package PVE::API2::Network::SDN::Fabrics::OpenFabric;
+
+use strict;
+use warnings;
+
+use Storable qw(dclone);
+
+use PVE::RPCEnvironment;
+use PVE::Tools qw(extract_param);
+
+use PVE::Network::SDN;
+use PVE::Network::SDN::Fabrics;
+use PVE::API2::Network::SDN::Fabrics::Common;
+
+use PVE::RESTHandler;
+use base qw(PVE::RESTHandler);
+
+__PACKAGE__->register_method({
+ name => 'delete_fabric',
+ path => '{fabric}',
+ method => 'DELETE',
+ description => 'Delete SDN Fabric',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id of the fabric to be deleted',
+ },
+ },
+ },
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::delete_fabric("openfabric", $param);
+ }, "delete sdn fabric failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'delete_node',
+ path => '{fabric}/node/{node}',
+ method => 'DELETE',
+ description => 'Delete SDN Fabric Node',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node to be deleted',
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::delete_node("openfabric", $param);
+ }, "delete sdn fabric node failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'update_fabric',
+ path => '{fabric}',
+ method => 'PUT',
+ description => 'Update SDN Fabric configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ hello_interval => {
+ optional => 1,
+ type => 'integer',
+ description => 'The hello_interval in seconds (1-600)',
+ },
+ },
+ },
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::edit_fabric("openfabric", $param);
+ }, "edit sdn fabric failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'update_node',
+ path => '{fabric}/node/{node}',
+ method => 'PUT',
+ description => 'Update SDN Fabric Node configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ router_id => {
+ type => 'string',
+ description => 'The Router-ID of this node (will be converted to a real NET later',
+ },
+ interfaces => {
+ type => 'array',
+ description => 'Array of openfabric interfaces as propertystrings',
+ items => {
+ type => 'string',
+ description => 'Propertystring of openfabric interfaces',
+ format => 'pve-sdn-openfabric-interface',
+ },
+ },
+ },
+ },
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::edit_node("openfabric", $param);
+ }, "edit sdn fabric node failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'get_fabric',
+ path => '{fabric}',
+ method => 'GET',
+ description => 'Get SDN Fabric configuration',
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ },
+ },
+ returns => {
+ type => 'object',
+ properties => {
+ fabric => {
+ type => 'object',
+ description => 'The fabric object',
+ properties => {
+ name => {
+ type => 'string',
+ description => 'The id of the fabric',
+ },
+ loopback_prefix => {
+ type => 'string',
+ description => 'The IP prefix for Loopback IPs',
+ },
+ hello_interval => {
+ optional => 1,
+ type => 'integer',
+ description => 'The global hello_interval option of the fabric, this will be set of on all interfaces automatically',
+ },
+ },
+ },
+ },
+ },
+ code => sub {
+ my ($param) = @_;
+
+ return PVE::API2::Network::SDN::Fabrics::Common::get_fabric("openfabric", $param);
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'get_node',
+ path => '{fabric}/node/{node}',
+ method => 'GET',
+ description => 'Get SDN Fabric Node configuration',
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The id of the fabric',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ },
+ },
+ returns => {
+ type => 'object',
+ properties => {
+ node => {
+ type => 'object',
+ description => 'The node object',
+ properties => {
+ router_id => {
+ type => 'string',
+ description => 'The Router-ID of this node (will be converted to a real NET later',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of this node',
+ },
+ interface => {
+ type => 'array',
+ description => 'Array of interfaces in this fabric and node',
+ items => {
+ type => 'string',
+ description => 'Propertystring of the interface',
+ format => 'pve-sdn-openfabric-interface',
+ }
+ },
+ }
+ }
+ }
+ },
+ code => sub {
+ my ($param) = @_;
+
+ return PVE::API2::Network::SDN::Fabrics::Common::get_node("openfabric", $param);
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'add_fabric',
+ path => '/',
+ method => 'POST',
+ description => 'Create SDN Fabric configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric_id => {
+ type => 'string',
+ description => 'The id of the fabric',
+ },
+ loopback_prefix => {
+ type => 'string',
+ description => 'The IP prefix for Loopback IPs',
+ },
+ hello_interval => {
+ type => 'number',
+ optional => 1,
+ description => 'The global hello_interval property in seconds, this will be set on all interfaces automatically',
+ }
+ },
+ },
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::add_fabric("openfabric", $param);
+ }, "add sdn fabric failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'add_node',
+ path => '{fabric}/node/{node}',
+ method => 'POST',
+ description => 'Create SDN Fabric Node configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/openfabric/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The node hostname',
+ },
+ router_id => {
+ type => 'string',
+ description => 'The Router-ID of this node (will be converted to a real NET later',
+ },
+ interfaces => {
+ type => 'array',
+ description => 'Array of the interfaces in this openfabric node',
+ items => {
+ type => 'string',
+ description => 'Propertystring of the interface',
+ format => 'pve-sdn-openfabric-interface',
+ },
+ },
+ },
+ },
+ returns => { type => 'null' },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::add_node("openfabric", $param);
+ }, "add sdn fabric node failed");
+ return undef;
+ },
+});
+
+1;
diff --git a/src/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile
index 4dbb6c92fd82..08bec7535530 100644
--- a/src/PVE/API2/Network/SDN/Makefile
+++ b/src/PVE/API2/Network/SDN/Makefile
@@ -7,4 +7,5 @@ PERL5DIR=${DESTDIR}/usr/share/perl5
install:
for i in ${SOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/PVE/API2/Network/SDN/$$i; done
make -C Zones install
+ make -C Fabrics install
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 13/17] fabric: openfabric: add api endpoints
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 13/17] fabric: openfabric: add api endpoints Gabriel Goller
@ 2025-04-02 10:37 ` Fabian Grünbichler
0 siblings, 0 replies; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:37 UTC (permalink / raw)
To: Proxmox VE development discussion
some high level comments, see below for details though I haven't
repeated them for all instances:
- lots of schema duplication
- lots of string types without formats
- no indices, but this is a two-level deep nested router with path
parameters/child links..
- ACL paths referenced are not yet valid/accepted by ACL API
- requires SDN.Allocate across the board, even for reading -> might
allow seeing (at least parts) of the config with Audit?
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Add CRUD endpoints for the openfabric fabric and node section types.
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/API2/Network/SDN/Fabrics/Makefile | 2 +-
> .../API2/Network/SDN/Fabrics/OpenFabric.pm | 348 ++++++++++++++++++
> src/PVE/API2/Network/SDN/Makefile | 1 +
> 3 files changed, 350 insertions(+), 1 deletion(-)
> create mode 100644 src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm
>
> diff --git a/src/PVE/API2/Network/SDN/Fabrics/Makefile b/src/PVE/API2/Network/SDN/Fabrics/Makefile
> index e433f2e7d0a6..8f7c630ef3ab 100644
> --- a/src/PVE/API2/Network/SDN/Fabrics/Makefile
> +++ b/src/PVE/API2/Network/SDN/Fabrics/Makefile
> @@ -1,4 +1,4 @@
> -SOURCES=OpenFabric.pm Ospf.pm Common.pm
> +SOURCES=OpenFabric.pm Common.pm
this was wrong then in the previous patch ;)
>
>
> PERL5DIR=${DESTDIR}/usr/share/perl5
> diff --git a/src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm b/src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm
> new file mode 100644
> index 000000000000..fa5802f97ddf
> --- /dev/null
> +++ b/src/PVE/API2/Network/SDN/Fabrics/OpenFabric.pm
> @@ -0,0 +1,348 @@
> +package PVE::API2::Network::SDN::Fabrics::OpenFabric;
> +
> +use strict;
> +use warnings;
> +
> +use Storable qw(dclone);
> +
> +use PVE::RPCEnvironment;
> +use PVE::Tools qw(extract_param);
> +
> +use PVE::Network::SDN;
> +use PVE::Network::SDN::Fabrics;
> +use PVE::API2::Network::SDN::Fabrics::Common;
> +
> +use PVE::RESTHandler;
> +use base qw(PVE::RESTHandler);
> +
> +__PACKAGE__->register_method({
> + name => 'delete_fabric',
> + path => '{fabric}',
> + method => 'DELETE',
> + description => 'Delete SDN Fabric',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
pve-access-control patch missing (for all endpoints below)
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
string without format
> + description => 'The fabric id of the fabric to be deleted',
> + },
> + },
> + },
> + returns => { type => 'null' },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::delete_fabric("openfabric", $param);
> + }, "delete sdn fabric failed");
lock_sdn_config will return undef anyway unless I am missing something?
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'delete_node',
> + path => '{fabric}/node/{node}',
should this maybe live under its own router together with the other
node/ endpoints?
> + method => 'DELETE',
> + description => 'Delete SDN Fabric Node',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
string without format
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node to be deleted',
string without format
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::delete_node("openfabric", $param);
> + }, "delete sdn fabric node failed");
> + return undef;
same as above
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'update_fabric',
> + path => '{fabric}',
> + method => 'PUT',
> + description => 'Update SDN Fabric configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
string without format
> + },
> + hello_interval => {
> + optional => 1,
> + type => 'integer',
> + description => 'The hello_interval in seconds (1-600)',
this repeats a lot of the schema, would it be possible to get it
generated somehow?
> + },
> + },
> + },
> + returns => { type => 'null' },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::edit_fabric("openfabric", $param);
> + }, "edit sdn fabric failed");
> + return undef;
same as above
> + },
> +});
> +
> +__PACKAGE__->register_method({
same comments apply here
> + name => 'update_node',
> + path => '{fabric}/node/{node}',
> + method => 'PUT',
> + description => 'Update SDN Fabric Node configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + router_id => {
> + type => 'string',
> + description => 'The Router-ID of this node (will be converted to a real NET later',
> + },
> + interfaces => {
> + type => 'array',
> + description => 'Array of openfabric interfaces as propertystrings',
> + items => {
> + type => 'string',
> + description => 'Propertystring of openfabric interfaces',
> + format => 'pve-sdn-openfabric-interface',
> + },
> + },
> + },
> + },
> + returns => { type => 'null' },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::edit_node("openfabric", $param);
> + }, "edit sdn fabric node failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'get_fabric',
> + path => '{fabric}',
should there be an index listing these, e.g. for pvesh?
> + method => 'GET',
> + description => 'Get SDN Fabric configuration',
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + },
> + },
> + returns => {
> + type => 'object',
> + properties => {
> + fabric => {
> + type => 'object',
> + description => 'The fabric object',
> + properties => {
> + name => {
> + type => 'string',
> + description => 'The id of the fabric',
> + },
> + loopback_prefix => {
> + type => 'string',
> + description => 'The IP prefix for Loopback IPs',
> + },
> + hello_interval => {
> + optional => 1,
> + type => 'integer',
> + description => 'The global hello_interval option of the fabric, this will be set of on all interfaces automatically',
> + },
> + },
> + },
> + },
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + return PVE::API2::Network::SDN::Fabrics::Common::get_fabric("openfabric", $param);
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'get_node',
> + path => '{fabric}/node/{node}',
same question here?
> + method => 'GET',
> + description => 'Get SDN Fabric Node configuration',
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The id of the fabric',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + },
> + },
> + returns => {
> + type => 'object',
> + properties => {
> + node => {
> + type => 'object',
> + description => 'The node object',
> + properties => {
> + router_id => {
> + type => 'string',
> + description => 'The Router-ID of this node (will be converted to a real NET later',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of this node',
> + },
> + interface => {
> + type => 'array',
> + description => 'Array of interfaces in this fabric and node',
> + items => {
> + type => 'string',
> + description => 'Propertystring of the interface',
> + format => 'pve-sdn-openfabric-interface',
> + }
> + },
> + }
> + }
> + }
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + return PVE::API2::Network::SDN::Fabrics::Common::get_node("openfabric", $param);
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'add_fabric',
> + path => '/',
> + method => 'POST',
> + description => 'Create SDN Fabric configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric_id => {
> + type => 'string',
> + description => 'The id of the fabric',
> + },
> + loopback_prefix => {
> + type => 'string',
> + description => 'The IP prefix for Loopback IPs',
> + },
> + hello_interval => {
> + type => 'number',
> + optional => 1,
> + description => 'The global hello_interval property in seconds, this will be set on all interfaces automatically',
> + }
> + },
> + },
> + returns => { type => 'null' },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::add_fabric("openfabric", $param);
> + }, "add sdn fabric failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'add_node',
so does this add a node
> + path => '{fabric}/node/{node}',
> + method => 'POST',
> + description => 'Create SDN Fabric Node configuration',
or just create/generate a config?
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/openfabric/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The node hostname',
> + },
> + router_id => {
> + type => 'string',
> + description => 'The Router-ID of this node (will be converted to a real NET later',
> + },
> + interfaces => {
> + type => 'array',
> + description => 'Array of the interfaces in this openfabric node',
> + items => {
> + type => 'string',
> + description => 'Propertystring of the interface',
> + format => 'pve-sdn-openfabric-interface',
> + },
> + },
> + },
> + },
> + returns => { type => 'null' },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::add_node("openfabric", $param);
> + }, "add sdn fabric node failed");
> + return undef;
> + },
> +});
> +
> +1;
> diff --git a/src/PVE/API2/Network/SDN/Makefile b/src/PVE/API2/Network/SDN/Makefile
> index 4dbb6c92fd82..08bec7535530 100644
> --- a/src/PVE/API2/Network/SDN/Makefile
> +++ b/src/PVE/API2/Network/SDN/Makefile
> @@ -7,4 +7,5 @@ PERL5DIR=${DESTDIR}/usr/share/perl5
> install:
> for i in ${SOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/PVE/API2/Network/SDN/$$i; done
> make -C Zones install
> + make -C Fabrics install
this also seems like it would belong in a different patch?
>
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-network 14/17] fabric: ospf: add api endpoints
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (39 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 13/17] fabric: openfabric: add api endpoints Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:37 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 15/17] test: fabrics: add test cases for ospf and openfabric + evpn Gabriel Goller
` (12 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Add CRUD endpoints for the ospf fabric and node section types.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/API2/Network/SDN/Fabrics/Makefile | 2 +-
src/PVE/API2/Network/SDN/Fabrics/Ospf.pm | 345 ++++++++++++++++++++++
2 files changed, 346 insertions(+), 1 deletion(-)
create mode 100644 src/PVE/API2/Network/SDN/Fabrics/Ospf.pm
diff --git a/src/PVE/API2/Network/SDN/Fabrics/Makefile b/src/PVE/API2/Network/SDN/Fabrics/Makefile
index 8f7c630ef3ab..e433f2e7d0a6 100644
--- a/src/PVE/API2/Network/SDN/Fabrics/Makefile
+++ b/src/PVE/API2/Network/SDN/Fabrics/Makefile
@@ -1,4 +1,4 @@
-SOURCES=OpenFabric.pm Common.pm
+SOURCES=OpenFabric.pm Ospf.pm Common.pm
PERL5DIR=${DESTDIR}/usr/share/perl5
diff --git a/src/PVE/API2/Network/SDN/Fabrics/Ospf.pm b/src/PVE/API2/Network/SDN/Fabrics/Ospf.pm
new file mode 100644
index 000000000000..badf7c89c183
--- /dev/null
+++ b/src/PVE/API2/Network/SDN/Fabrics/Ospf.pm
@@ -0,0 +1,345 @@
+package PVE::API2::Network::SDN::Fabrics::Ospf;
+
+use strict;
+use warnings;
+
+use Storable qw(dclone);
+
+use PVE::RPCEnvironment;
+use PVE::Tools qw(extract_param);
+
+use PVE::Network::SDN;
+use PVE::Network::SDN::Fabrics;
+use PVE::API2::Network::SDN::Fabrics::Common;
+
+use PVE::RESTHandler;
+use base qw(PVE::RESTHandler);
+
+__PACKAGE__->register_method({
+ name => 'delete_fabric',
+ path => '{fabric}',
+ method => 'DELETE',
+ description => 'Delete SDN Fabric',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::delete_fabric("ospf", $param);
+ }, "delete sdn fabric failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'delete_node',
+ path => '{fabric}/node/{node}',
+ method => 'DELETE',
+ description => 'Delete SDN Fabric Node',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::delete_node("ospf", $param);
+ }, "delete sdn fabric node failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'update_fabric',
+ path => '{fabric}',
+ method => 'PUT',
+ description => 'Update SDN Fabric configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::edit_fabric("ospf", $param);
+ }, "edit sdn fabric failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'update_node',
+ path => '{fabric}/node/{node}',
+ method => 'PUT',
+ description => 'Update SDN Fabric Interface configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ router_id => {
+ type => 'string',
+ description => 'The OSPF router_id, an IPv4 address',
+ },
+ interfaces => {
+ type => 'array',
+ description => 'The OSPF interfaces on this node',
+ items => {
+ type => 'string',
+ description => 'Propertystring of the OSPF interface',
+ format => 'pve-sdn-ospf-interface',
+ },
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::edit_node("ospf", $param);
+ }, "edit sdn fabric node failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'get_fabric',
+ path => '{fabric}',
+ method => 'GET',
+ description => 'Get SDN Fabric configuration',
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ }
+ },
+ },
+ returns => {
+ type => 'object',
+ properties => {
+ fabric => {
+ type => 'object',
+ description => 'The fabric object',
+ properties => {
+ name => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ loopback_prefix => {
+ type => 'string',
+ description => 'The IP prefix for Loopback IPs',
+ },
+ }
+ }
+ }
+ },
+ code => sub {
+ my ($param) = @_;
+
+ return PVE::API2::Network::SDN::Fabrics::Common::get_fabric("ospf", $param);
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'get_node',
+ path => '{fabric}/node/{node}',
+ method => 'GET',
+ description => 'Get SDN Fabric Node configuration',
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ },
+ },
+ returns => {
+ type => 'object',
+ properties => {
+ node => {
+ type => 'object',
+ description => 'The node object',
+ properties => {
+ router_id => {
+ type => 'string',
+ description => 'The OSPF router_id of the node',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ interface => {
+ type => 'array',
+ description => 'The OSPF interfaces on this node',
+ items => {
+ description => 'Propertystring of the OSPF interface',
+ type => 'string',
+ format => 'pve-sdn-ospf-interface',
+ }
+ },
+ }
+ }
+ }
+ },
+ code => sub {
+ my ($param) = @_;
+
+ return PVE::API2::Network::SDN::Fabrics::Common::get_node("ospf", $param);
+ },
+});
+
+
+__PACKAGE__->register_method({
+ name => 'add_fabric',
+ path => '/',
+ method => 'POST',
+ description => 'Create SDN Fabric configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ area => {
+ type => 'string',
+ description => 'The fabric area',
+ },
+ loopback_prefix => {
+ type => 'string',
+ description => 'The IP prefix for Loopback IPs',
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::add_fabric("ospf", $param);
+ }, "add sdn fabric failed");
+ return undef;
+ },
+});
+
+__PACKAGE__->register_method({
+ name => 'add_node',
+ path => '{fabric}/node/{node}',
+ method => 'POST',
+ description => 'Create SDN Fabric Node configuration',
+ protected => 1,
+ permissions => {
+ check => ['perm', '/sdn/fabrics/ospf/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
+ },
+ parameters => {
+ properties => {
+ fabric => {
+ type => 'string',
+ description => 'The fabric id',
+ },
+ node => {
+ type => 'string',
+ description => 'The hostname of the node',
+ },
+ router_id => {
+ type => 'string',
+ description => 'The OSPF router_id of this node',
+ },
+ interfaces => {
+ type => 'array',
+ description => 'The OSPF intefaces on this node',
+ items => {
+ type => 'string',
+ description => 'Propertystring of the OSPF inteface',
+ format => 'pve-sdn-ospf-interface',
+ },
+ },
+ },
+ },
+ returns => {
+ type => 'null',
+ },
+ code => sub {
+ my ($param) = @_;
+
+ PVE::Network::SDN::lock_sdn_config(
+ sub {
+ PVE::API2::Network::SDN::Fabrics::Common::add_node("ospf", $param);
+ }, "add sdn fabric node failed");
+ return undef;
+ },
+});
+
+
+1;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 14/17] fabric: ospf: add api endpoints
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 14/17] fabric: ospf: " Gabriel Goller
@ 2025-04-02 10:37 ` Fabian Grünbichler
0 siblings, 0 replies; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:37 UTC (permalink / raw)
To: Proxmox VE development discussion
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Add CRUD endpoints for the ospf fabric and node section types.
same comments as for the openfabrics one apply here as well..
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/API2/Network/SDN/Fabrics/Makefile | 2 +-
> src/PVE/API2/Network/SDN/Fabrics/Ospf.pm | 345 ++++++++++++++++++++++
> 2 files changed, 346 insertions(+), 1 deletion(-)
> create mode 100644 src/PVE/API2/Network/SDN/Fabrics/Ospf.pm
>
> diff --git a/src/PVE/API2/Network/SDN/Fabrics/Makefile b/src/PVE/API2/Network/SDN/Fabrics/Makefile
> index 8f7c630ef3ab..e433f2e7d0a6 100644
> --- a/src/PVE/API2/Network/SDN/Fabrics/Makefile
> +++ b/src/PVE/API2/Network/SDN/Fabrics/Makefile
> @@ -1,4 +1,4 @@
> -SOURCES=OpenFabric.pm Common.pm
> +SOURCES=OpenFabric.pm Ospf.pm Common.pm
>
>
> PERL5DIR=${DESTDIR}/usr/share/perl5
> diff --git a/src/PVE/API2/Network/SDN/Fabrics/Ospf.pm b/src/PVE/API2/Network/SDN/Fabrics/Ospf.pm
I know we are not support consistent with this, but should it be OSPF?
> new file mode 100644
> index 000000000000..badf7c89c183
> --- /dev/null
> +++ b/src/PVE/API2/Network/SDN/Fabrics/Ospf.pm
> @@ -0,0 +1,345 @@
> +package PVE::API2::Network::SDN::Fabrics::Ospf;
> +
> +use strict;
> +use warnings;
> +
> +use Storable qw(dclone);
> +
> +use PVE::RPCEnvironment;
> +use PVE::Tools qw(extract_param);
> +
> +use PVE::Network::SDN;
> +use PVE::Network::SDN::Fabrics;
> +use PVE::API2::Network::SDN::Fabrics::Common;
> +
> +use PVE::RESTHandler;
> +use base qw(PVE::RESTHandler);
> +
> +__PACKAGE__->register_method({
> + name => 'delete_fabric',
> + path => '{fabric}',
> + method => 'DELETE',
> + description => 'Delete SDN Fabric',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::delete_fabric("ospf", $param);
> + }, "delete sdn fabric failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'delete_node',
> + path => '{fabric}/node/{node}',
> + method => 'DELETE',
> + description => 'Delete SDN Fabric Node',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::delete_node("ospf", $param);
> + }, "delete sdn fabric node failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'update_fabric',
> + path => '{fabric}',
> + method => 'PUT',
> + description => 'Update SDN Fabric configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::edit_fabric("ospf", $param);
> + }, "edit sdn fabric failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'update_node',
> + path => '{fabric}/node/{node}',
> + method => 'PUT',
> + description => 'Update SDN Fabric Interface configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + router_id => {
> + type => 'string',
> + description => 'The OSPF router_id, an IPv4 address',
> + },
> + interfaces => {
> + type => 'array',
> + description => 'The OSPF interfaces on this node',
> + items => {
> + type => 'string',
> + description => 'Propertystring of the OSPF interface',
> + format => 'pve-sdn-ospf-interface',
> + },
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::edit_node("ospf", $param);
> + }, "edit sdn fabric node failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'get_fabric',
> + path => '{fabric}',
> + method => 'GET',
> + description => 'Get SDN Fabric configuration',
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + }
> + },
> + },
> + returns => {
> + type => 'object',
> + properties => {
> + fabric => {
> + type => 'object',
> + description => 'The fabric object',
> + properties => {
> + name => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + loopback_prefix => {
> + type => 'string',
> + description => 'The IP prefix for Loopback IPs',
> + },
> + }
> + }
> + }
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + return PVE::API2::Network::SDN::Fabrics::Common::get_fabric("ospf", $param);
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'get_node',
> + path => '{fabric}/node/{node}',
> + method => 'GET',
> + description => 'Get SDN Fabric Node configuration',
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + },
> + },
> + returns => {
> + type => 'object',
> + properties => {
> + node => {
> + type => 'object',
> + description => 'The node object',
> + properties => {
> + router_id => {
> + type => 'string',
> + description => 'The OSPF router_id of the node',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + interface => {
> + type => 'array',
> + description => 'The OSPF interfaces on this node',
> + items => {
> + description => 'Propertystring of the OSPF interface',
> + type => 'string',
> + format => 'pve-sdn-ospf-interface',
> + }
> + },
> + }
> + }
> + }
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + return PVE::API2::Network::SDN::Fabrics::Common::get_node("ospf", $param);
> + },
> +});
> +
> +
> +__PACKAGE__->register_method({
> + name => 'add_fabric',
> + path => '/',
> + method => 'POST',
> + description => 'Create SDN Fabric configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + area => {
> + type => 'string',
> + description => 'The fabric area',
> + },
> + loopback_prefix => {
> + type => 'string',
> + description => 'The IP prefix for Loopback IPs',
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::add_fabric("ospf", $param);
> + }, "add sdn fabric failed");
> + return undef;
> + },
> +});
> +
> +__PACKAGE__->register_method({
> + name => 'add_node',
> + path => '{fabric}/node/{node}',
> + method => 'POST',
> + description => 'Create SDN Fabric Node configuration',
> + protected => 1,
> + permissions => {
> + check => ['perm', '/sdn/fabrics/ospf/{fabric}/node/{node}', [ 'SDN.Allocate' ]],
> + },
> + parameters => {
> + properties => {
> + fabric => {
> + type => 'string',
> + description => 'The fabric id',
> + },
> + node => {
> + type => 'string',
> + description => 'The hostname of the node',
> + },
> + router_id => {
> + type => 'string',
> + description => 'The OSPF router_id of this node',
> + },
> + interfaces => {
> + type => 'array',
> + description => 'The OSPF intefaces on this node',
> + items => {
> + type => 'string',
> + description => 'Propertystring of the OSPF inteface',
> + format => 'pve-sdn-ospf-interface',
> + },
> + },
> + },
> + },
> + returns => {
> + type => 'null',
> + },
> + code => sub {
> + my ($param) = @_;
> +
> + PVE::Network::SDN::lock_sdn_config(
> + sub {
> + PVE::API2::Network::SDN::Fabrics::Common::add_node("ospf", $param);
> + }, "add sdn fabric node failed");
> + return undef;
> + },
> +});
> +
> +
> +1;
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-network 15/17] test: fabrics: add test cases for ospf and openfabric + evpn
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (40 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 14/17] fabric: ospf: " Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 16/17] frr: bump frr config version to 10.2.1 Gabriel Goller
` (11 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Add two additional test cases for EVPN zones, which use fabrics as the
underlay network - one for OSPF, one for OpenFabric.
They cover a full-mesh fabric setup as well as a simple point-to-point
setup to a route reflector as the underlay fabric.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
.../expected_controller_config | 72 +++++++++++++++++
.../openfabric_fabric/expected_sdn_interfaces | 56 +++++++++++++
.../zones/evpn/openfabric_fabric/interfaces | 6 ++
.../zones/evpn/openfabric_fabric/sdn_config | 79 +++++++++++++++++++
.../ospf_fabric/expected_controller_config | 66 ++++++++++++++++
.../evpn/ospf_fabric/expected_sdn_interfaces | 53 +++++++++++++
src/test/zones/evpn/ospf_fabric/interfaces | 6 ++
src/test/zones/evpn/ospf_fabric/sdn_config | 75 ++++++++++++++++++
8 files changed, 413 insertions(+)
create mode 100644 src/test/zones/evpn/openfabric_fabric/expected_controller_config
create mode 100644 src/test/zones/evpn/openfabric_fabric/expected_sdn_interfaces
create mode 100644 src/test/zones/evpn/openfabric_fabric/interfaces
create mode 100644 src/test/zones/evpn/openfabric_fabric/sdn_config
create mode 100644 src/test/zones/evpn/ospf_fabric/expected_controller_config
create mode 100644 src/test/zones/evpn/ospf_fabric/expected_sdn_interfaces
create mode 100644 src/test/zones/evpn/ospf_fabric/interfaces
create mode 100644 src/test/zones/evpn/ospf_fabric/sdn_config
diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config
new file mode 100644
index 000000000000..264a7c422c11
--- /dev/null
+++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config
@@ -0,0 +1,72 @@
+frr version 8.5.2
+frr defaults datacenter
+hostname localhost
+log syslog informational
+service integrated-vtysh-config
+!
+!
+vrf vrf_evpn
+ vni 100
+exit-vrf
+!
+router bgp 65000
+ bgp router-id 172.20.3.1
+ no bgp hard-administrative-reset
+ no bgp default ipv4-unicast
+ coalesce-time 1000
+ no bgp graceful-restart notification
+ neighbor VTEP peer-group
+ neighbor VTEP remote-as 65000
+ neighbor VTEP bfd
+ neighbor 172.20.3.2 peer-group VTEP
+ neighbor 172.20.3.3 peer-group VTEP
+ !
+ address-family l2vpn evpn
+ neighbor VTEP activate
+ neighbor VTEP route-map MAP_VTEP_IN in
+ neighbor VTEP route-map MAP_VTEP_OUT out
+ advertise-all-vni
+ exit-address-family
+exit
+!
+router bgp 65000 vrf vrf_evpn
+ bgp router-id 172.20.3.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
+exit
+!
+route-map MAP_VTEP_IN permit 1
+exit
+!
+route-map MAP_VTEP_OUT permit 1
+exit
+router openfabric test
+ net 49.0001.1720.2000.3001.00
+exit
+!
+interface dummy_test
+ ip router openfabric test
+ openfabric passive
+exit
+!
+interface ens20
+ ip router openfabric test
+ openfabric hello-interval 1
+exit
+!
+interface ens21
+ ip router openfabric test
+ openfabric hello-interval 1
+exit
+!
+access-list openfabric_test_ips permit 172.20.3.0/24
+!
+route-map openfabric permit 100
+ match ip address openfabric_test_ips
+ set src 172.20.3.1
+exit
+!
+ip protocol openfabric route-map openfabric
+!
+line vty
+!
\ No newline at end of file
diff --git a/src/test/zones/evpn/openfabric_fabric/expected_sdn_interfaces b/src/test/zones/evpn/openfabric_fabric/expected_sdn_interfaces
new file mode 100644
index 000000000000..e76e0b9e00d5
--- /dev/null
+++ b/src/test/zones/evpn/openfabric_fabric/expected_sdn_interfaces
@@ -0,0 +1,56 @@
+#version:1
+
+auto vnet0
+iface vnet0
+ address 10.123.123.1/24
+ hwaddress BC:24:11:3B:39:34
+ bridge_ports vxlan_vnet0
+ bridge_stp off
+ bridge_fd 0
+ mtu 1450
+ ip-forward on
+ arp-accept on
+ vrf vrf_evpn
+
+auto vrf_evpn
+iface vrf_evpn
+ vrf-table auto
+ post-up ip route add vrf vrf_evpn unreachable default metric 4278198272
+
+auto vrfbr_evpn
+iface vrfbr_evpn
+ bridge-ports vrfvx_evpn
+ bridge_stp off
+ bridge_fd 0
+ mtu 1450
+ vrf vrf_evpn
+
+auto vrfvx_evpn
+iface vrfvx_evpn
+ vxlan-id 100
+ vxlan-local-tunnelip 172.20.3.1
+ bridge-learning off
+ bridge-arp-nd-suppress on
+ mtu 1450
+
+auto vxlan_vnet0
+iface vxlan_vnet0
+ vxlan-id 123456
+ vxlan-local-tunnelip 172.20.3.1
+ bridge-learning off
+ bridge-arp-nd-suppress on
+ mtu 1450
+
+auto dummy_test
+iface dummy_test inet static
+ link-type dummy
+ ip-forward 1
+ address 172.20.3.1/32
+
+auto ens20
+iface ens20 inet manual
+ ip-forward 1
+
+auto ens21
+iface ens21 inet manual
+ ip-forward 1
diff --git a/src/test/zones/evpn/openfabric_fabric/interfaces b/src/test/zones/evpn/openfabric_fabric/interfaces
new file mode 100644
index 000000000000..1b4384bdd8a3
--- /dev/null
+++ b/src/test/zones/evpn/openfabric_fabric/interfaces
@@ -0,0 +1,6 @@
+auto vmbr0
+iface vmbr0 inet static
+ address 172.20.3.1/32
+ bridge-ports eth0
+ bridge-stp off
+ bridge-fd 0
diff --git a/src/test/zones/evpn/openfabric_fabric/sdn_config b/src/test/zones/evpn/openfabric_fabric/sdn_config
new file mode 100644
index 000000000000..2c32598b6308
--- /dev/null
+++ b/src/test/zones/evpn/openfabric_fabric/sdn_config
@@ -0,0 +1,79 @@
+{
+ 'zones' => {
+ 'ids' => {
+ 'evpn' => {
+ 'type' => 'evpn',
+ 'ipam' => 'pve',
+ 'mac' => 'BC:24:11:3B:39:34',
+ 'controller' => 'ctrl',
+ 'vrf-vxlan' => 100
+ }
+ }
+ },
+ 'vnets' => {
+ 'ids' => {
+ 'vnet0' => {
+ 'zone' => 'evpn',
+ 'type' => 'vnet',
+ 'tag' => 123456
+ }
+ }
+ },
+ 'version' => 1,
+ 'subnets' => {
+ 'ids' => {
+ 'evpn-10.123.123.0-24' => {
+ 'vnet' => 'vnet0',
+ 'type' => 'subnet',
+ 'gateway' => '10.123.123.1'
+ }
+ }
+ },
+ 'controllers' => {
+ 'ids' => {
+ 'ctrl' => {
+ 'peers' => '172.20.3.1,172.20.3.2,172.20.3.3',
+ 'asn' => 65000,
+ 'type' => 'evpn'
+ }
+ }
+ },
+ 'openfabric' => {
+ 'ids' => {
+ 'test' => {
+ 'ty' => 'fabric',
+ 'fabric_id' => 'test',
+ 'hello_interval' => 1,
+ 'loopback_prefix' => '172.20.3.0/24'
+ },
+ 'test_localhost' => {
+ 'interface' => [
+ 'name=ens20',
+ 'name=ens21'
+ ],
+ 'node_id' => 'test_localhost',
+ 'ty' => 'node',
+ 'router_id' => '172.20.3.1'
+ },
+ 'test_pathfinder' => {
+ 'node_id' => 'test_pathfinder',
+ 'interface' => [
+ 'name=ens20',
+ 'name=ens21'
+ ],
+ 'router_id' => '172.20.3.2',
+ 'ty' => 'node'
+ },
+ 'test_raider' => {
+ 'router_id' => '172.20.3.3',
+ 'ty' => 'node',
+ 'interface' => [
+ 'name=ens21',
+ 'name=ens20'
+ ],
+ 'node_id' => 'test_raider'
+ }
+ }
+ }
+ };
+
diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config
new file mode 100644
index 000000000000..75fb1ffa1717
--- /dev/null
+++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config
@@ -0,0 +1,66 @@
+frr version 8.5.2
+frr defaults datacenter
+hostname localhost
+log syslog informational
+service integrated-vtysh-config
+!
+!
+vrf vrf_evpn
+ vni 100
+exit-vrf
+!
+router bgp 65000
+ bgp router-id 172.20.30.1
+ no bgp hard-administrative-reset
+ no bgp default ipv4-unicast
+ coalesce-time 1000
+ no bgp graceful-restart notification
+ neighbor VTEP peer-group
+ neighbor VTEP remote-as 65000
+ neighbor VTEP bfd
+ neighbor 172.20.30.2 peer-group VTEP
+ neighbor 172.20.30.3 peer-group VTEP
+ !
+ address-family l2vpn evpn
+ neighbor VTEP activate
+ neighbor VTEP route-map MAP_VTEP_IN in
+ neighbor VTEP route-map MAP_VTEP_OUT out
+ advertise-all-vni
+ exit-address-family
+exit
+!
+router bgp 65000 vrf vrf_evpn
+ bgp router-id 172.20.30.1
+ no bgp hard-administrative-reset
+ no bgp graceful-restart notification
+exit
+!
+route-map MAP_VTEP_IN permit 1
+exit
+!
+route-map MAP_VTEP_OUT permit 1
+exit
+router ospf
+ ospf router-id 172.20.30.1
+exit
+!
+interface dummy_0
+ ip ospf area 0
+ ip ospf passive
+exit
+!
+interface ens19
+ ip ospf area 0
+exit
+!
+access-list ospf_0_ips permit 172.20.30.0/24
+!
+route-map ospf permit 10
+ match ip address ospf_0_ips
+ set src 172.20.30.1
+exit
+!
+ip protocol ospf route-map ospf
+!
+line vty
+!
\ No newline at end of file
diff --git a/src/test/zones/evpn/ospf_fabric/expected_sdn_interfaces b/src/test/zones/evpn/ospf_fabric/expected_sdn_interfaces
new file mode 100644
index 000000000000..cadf046bc2bf
--- /dev/null
+++ b/src/test/zones/evpn/ospf_fabric/expected_sdn_interfaces
@@ -0,0 +1,53 @@
+#version:1
+
+auto vnet0
+iface vnet0
+ address 10.123.123.1/24
+ hwaddress BC:24:11:3B:39:34
+ bridge_ports vxlan_vnet0
+ bridge_stp off
+ bridge_fd 0
+ mtu 1450
+ ip-forward on
+ arp-accept on
+ vrf vrf_evpn
+
+auto vrf_evpn
+iface vrf_evpn
+ vrf-table auto
+ post-up ip route add vrf vrf_evpn unreachable default metric 4278198272
+
+auto vrfbr_evpn
+iface vrfbr_evpn
+ bridge-ports vrfvx_evpn
+ bridge_stp off
+ bridge_fd 0
+ mtu 1450
+ vrf vrf_evpn
+
+auto vrfvx_evpn
+iface vrfvx_evpn
+ vxlan-id 100
+ vxlan-local-tunnelip 172.20.30.1
+ bridge-learning off
+ bridge-arp-nd-suppress on
+ mtu 1450
+
+auto vxlan_vnet0
+iface vxlan_vnet0
+ vxlan-id 123456
+ vxlan-local-tunnelip 172.20.30.1
+ bridge-learning off
+ bridge-arp-nd-suppress on
+ mtu 1450
+
+auto dummy_0
+iface dummy_0 inet static
+ link-type dummy
+ ip-forward 1
+ address 172.20.30.1/32
+
+auto ens19
+iface ens19 inet static
+ address 172.16.3.10/31
+ ip-forward 1
diff --git a/src/test/zones/evpn/ospf_fabric/interfaces b/src/test/zones/evpn/ospf_fabric/interfaces
new file mode 100644
index 000000000000..79ba9c11bd0a
--- /dev/null
+++ b/src/test/zones/evpn/ospf_fabric/interfaces
@@ -0,0 +1,6 @@
+auto vmbr0
+iface vmbr0 inet static
+ address 172.20.30.1/32
+ bridge-ports eth0
+ bridge-stp off
+ bridge-fd 0
diff --git a/src/test/zones/evpn/ospf_fabric/sdn_config b/src/test/zones/evpn/ospf_fabric/sdn_config
new file mode 100644
index 000000000000..938c088dd43c
--- /dev/null
+++ b/src/test/zones/evpn/ospf_fabric/sdn_config
@@ -0,0 +1,75 @@
+{
+ 'zones' => {
+ 'ids' => {
+ 'evpn' => {
+ 'type' => 'evpn',
+ 'ipam' => 'pve',
+ 'mac' => 'BC:24:11:3B:39:34',
+ 'controller' => 'ctrl',
+ 'vrf-vxlan' => 100
+ }
+ }
+ },
+ 'vnets' => {
+ 'ids' => {
+ 'vnet0' => {
+ 'zone' => 'evpn',
+ 'type' => 'vnet',
+ 'tag' => 123456
+ }
+ }
+ },
+ 'version' => 1,
+ 'subnets' => {
+ 'ids' => {
+ 'evpn-10.123.123.0-24' => {
+ 'vnet' => 'vnet0',
+ 'type' => 'subnet',
+ 'gateway' => '10.123.123.1'
+ }
+ }
+ },
+ 'controllers' => {
+ 'ids' => {
+ 'ctrl' => {
+ 'peers' => '172.20.30.1,172.20.30.2,172.20.30.3',
+ 'asn' => 65000,
+ 'type' => 'evpn'
+ }
+ }
+ },
+ 'ospf' => {
+ 'ids' => {
+ '0_pathfinder' => {
+ 'node_id' => '0_pathfinder',
+ 'interface' => [
+ 'name=ens19,ip=172.16.3.20/31'
+ ],
+ 'router_id' => '172.20.30.2',
+ 'ty' => 'node'
+ },
+ '0' => {
+ 'loopback_prefix' => '172.20.30.0/24',
+ 'area' => '0',
+ 'ty' => 'fabric'
+ },
+ '0_localhost' => {
+ 'node_id' => '0_localhost',
+ 'interface' => [
+ 'name=ens19,passive=false,ip=172.16.3.10/31'
+ ],
+ 'router_id' => '172.20.30.1',
+ 'ty' => 'node'
+ },
+ '0_raider' => {
+ 'ty' => 'node',
+ 'router_id' => '172.20.30.3',
+ 'node_id' => '0_raider',
+ 'interface' => [
+ 'name=ens19,ip=172.16.3.30/31'
+ ]
+ }
+ }
+ }
+ };
+
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 16/17] frr: bump frr config version to 10.2.1
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (41 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 15/17] test: fabrics: add test cases for ospf and openfabric + evpn Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration Gabriel Goller
` (10 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN/Frr.pm | 2 +-
.../zones/evpn/advertise_subnets/expected_controller_config | 2 +-
.../evpn/disable_arp_nd_suppression/expected_controller_config | 2 +-
src/test/zones/evpn/ebgp/expected_controller_config | 2 +-
src/test/zones/evpn/ebgp_loopback/expected_controller_config | 2 +-
src/test/zones/evpn/exitnode/expected_controller_config | 2 +-
.../evpn/exitnode_local_routing/expected_controller_config | 2 +-
src/test/zones/evpn/exitnode_primary/expected_controller_config | 2 +-
src/test/zones/evpn/exitnode_snat/expected_controller_config | 2 +-
.../zones/evpn/exitnodenullroute/expected_controller_config | 2 +-
src/test/zones/evpn/ipv4/expected_controller_config | 2 +-
src/test/zones/evpn/ipv4ipv6/expected_controller_config | 2 +-
.../zones/evpn/ipv4ipv6nogateway/expected_controller_config | 2 +-
src/test/zones/evpn/ipv6/expected_controller_config | 2 +-
src/test/zones/evpn/ipv6underlay/expected_controller_config | 2 +-
src/test/zones/evpn/isis/expected_controller_config | 2 +-
src/test/zones/evpn/isis_loopback/expected_controller_config | 2 +-
src/test/zones/evpn/isis_standalone/expected_controller_config | 2 +-
src/test/zones/evpn/multipath_relax/expected_controller_config | 2 +-
src/test/zones/evpn/multiplezones/expected_controller_config | 2 +-
.../zones/evpn/openfabric_fabric/expected_controller_config | 2 +-
src/test/zones/evpn/ospf_fabric/expected_controller_config | 2 +-
src/test/zones/evpn/rt_import/expected_controller_config | 2 +-
src/test/zones/evpn/vxlanport/expected_controller_config | 2 +-
24 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
index 9ae302a9c25f..7922e27cbfc0 100644
--- a/src/PVE/Network/SDN/Frr.pm
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -166,7 +166,7 @@ sub raw_config_to_string {
my $nodename = PVE::INotify::nodename();
my @final_config = (
- "frr version 8.5.2",
+ "frr version 10.2.1",
"frr defaults datacenter",
"hostname $nodename",
"log syslog informational",
diff --git a/src/test/zones/evpn/advertise_subnets/expected_controller_config b/src/test/zones/evpn/advertise_subnets/expected_controller_config
index 473a47080f6e..8ce94871f6b3 100644
--- a/src/test/zones/evpn/advertise_subnets/expected_controller_config
+++ b/src/test/zones/evpn/advertise_subnets/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
index 9d8ec609b307..dc485a8b308d 100644
--- a/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
+++ b/src/test/zones/evpn/disable_arp_nd_suppression/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ebgp/expected_controller_config b/src/test/zones/evpn/ebgp/expected_controller_config
index 8dfb6de774fe..a21510cd4238 100644
--- a/src/test/zones/evpn/ebgp/expected_controller_config
+++ b/src/test/zones/evpn/ebgp/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ebgp_loopback/expected_controller_config b/src/test/zones/evpn/ebgp_loopback/expected_controller_config
index 82eef1158982..10992c0393b0 100644
--- a/src/test/zones/evpn/ebgp_loopback/expected_controller_config
+++ b/src/test/zones/evpn/ebgp_loopback/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/exitnode/expected_controller_config b/src/test/zones/evpn/exitnode/expected_controller_config
index 99e933a8c4dc..acf0adcc3717 100644
--- a/src/test/zones/evpn/exitnode/expected_controller_config
+++ b/src/test/zones/evpn/exitnode/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config
index 2bc55727fb58..e71bc26c5bc8 100644
--- a/src/test/zones/evpn/exitnode_local_routing/expected_controller_config
+++ b/src/test/zones/evpn/exitnode_local_routing/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/exitnode_primary/expected_controller_config b/src/test/zones/evpn/exitnode_primary/expected_controller_config
index 28c91a550f2e..a664878944eb 100644
--- a/src/test/zones/evpn/exitnode_primary/expected_controller_config
+++ b/src/test/zones/evpn/exitnode_primary/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/exitnode_snat/expected_controller_config b/src/test/zones/evpn/exitnode_snat/expected_controller_config
index 99e933a8c4dc..acf0adcc3717 100644
--- a/src/test/zones/evpn/exitnode_snat/expected_controller_config
+++ b/src/test/zones/evpn/exitnode_snat/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/exitnodenullroute/expected_controller_config b/src/test/zones/evpn/exitnodenullroute/expected_controller_config
index fc8ae67b2a35..b80e9f542ce9 100644
--- a/src/test/zones/evpn/exitnodenullroute/expected_controller_config
+++ b/src/test/zones/evpn/exitnodenullroute/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ipv4/expected_controller_config b/src/test/zones/evpn/ipv4/expected_controller_config
index 9d8ec609b307..dc485a8b308d 100644
--- a/src/test/zones/evpn/ipv4/expected_controller_config
+++ b/src/test/zones/evpn/ipv4/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ipv4ipv6/expected_controller_config b/src/test/zones/evpn/ipv4ipv6/expected_controller_config
index 9d8ec609b307..dc485a8b308d 100644
--- a/src/test/zones/evpn/ipv4ipv6/expected_controller_config
+++ b/src/test/zones/evpn/ipv4ipv6/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
index 9d8ec609b307..dc485a8b308d 100644
--- a/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
+++ b/src/test/zones/evpn/ipv4ipv6nogateway/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ipv6/expected_controller_config b/src/test/zones/evpn/ipv6/expected_controller_config
index 9d8ec609b307..dc485a8b308d 100644
--- a/src/test/zones/evpn/ipv6/expected_controller_config
+++ b/src/test/zones/evpn/ipv6/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ipv6underlay/expected_controller_config b/src/test/zones/evpn/ipv6underlay/expected_controller_config
index fffd4157a8bf..44a580595226 100644
--- a/src/test/zones/evpn/ipv6underlay/expected_controller_config
+++ b/src/test/zones/evpn/ipv6underlay/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/isis/expected_controller_config b/src/test/zones/evpn/isis/expected_controller_config
index 9ec8c018f97f..0eca3c4124f7 100644
--- a/src/test/zones/evpn/isis/expected_controller_config
+++ b/src/test/zones/evpn/isis/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/isis_loopback/expected_controller_config b/src/test/zones/evpn/isis_loopback/expected_controller_config
index 5a7f5c9fd5e5..2cf055d5d153 100644
--- a/src/test/zones/evpn/isis_loopback/expected_controller_config
+++ b/src/test/zones/evpn/isis_loopback/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/isis_standalone/expected_controller_config b/src/test/zones/evpn/isis_standalone/expected_controller_config
index 5c9bf1adfbae..34c6738c644d 100644
--- a/src/test/zones/evpn/isis_standalone/expected_controller_config
+++ b/src/test/zones/evpn/isis_standalone/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/multipath_relax/expected_controller_config b/src/test/zones/evpn/multipath_relax/expected_controller_config
index a87cdc44d54e..00d28d183249 100644
--- a/src/test/zones/evpn/multipath_relax/expected_controller_config
+++ b/src/test/zones/evpn/multipath_relax/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/multiplezones/expected_controller_config b/src/test/zones/evpn/multiplezones/expected_controller_config
index 37f663a32572..8055268f8285 100644
--- a/src/test/zones/evpn/multiplezones/expected_controller_config
+++ b/src/test/zones/evpn/multiplezones/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/openfabric_fabric/expected_controller_config b/src/test/zones/evpn/openfabric_fabric/expected_controller_config
index 264a7c422c11..a1d06725cdd9 100644
--- a/src/test/zones/evpn/openfabric_fabric/expected_controller_config
+++ b/src/test/zones/evpn/openfabric_fabric/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/ospf_fabric/expected_controller_config b/src/test/zones/evpn/ospf_fabric/expected_controller_config
index 75fb1ffa1717..5c70d04cc5dd 100644
--- a/src/test/zones/evpn/ospf_fabric/expected_controller_config
+++ b/src/test/zones/evpn/ospf_fabric/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/rt_import/expected_controller_config b/src/test/zones/evpn/rt_import/expected_controller_config
index 5bdb148f94a4..65b70f8be6ad 100644
--- a/src/test/zones/evpn/rt_import/expected_controller_config
+++ b/src/test/zones/evpn/rt_import/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
diff --git a/src/test/zones/evpn/vxlanport/expected_controller_config b/src/test/zones/evpn/vxlanport/expected_controller_config
index 9d8ec609b307..dc485a8b308d 100644
--- a/src/test/zones/evpn/vxlanport/expected_controller_config
+++ b/src/test/zones/evpn/vxlanport/expected_controller_config
@@ -1,4 +1,4 @@
-frr version 8.5.2
+frr version 10.2.1
frr defaults datacenter
hostname localhost
log syslog informational
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (42 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 16/17] frr: bump frr config version to 10.2.1 Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 10:37 ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 1/7] api: use new generalized frr and etc network config helper functions Gabriel Goller
` (9 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
From: Stefan Hanreich <s.hanreich@proxmox.com>
Reloading the FRR configuration failed, because outfunc was defined as
an empty hash, but Tools.pm requires it to be a CODE reference, so the
following error has been thrown on FRR reload:
Not a CODE reference at /usr/share/perl5/PVE/Tools.pm line 577.
Fix this by not providing an outfunc at all (it was empty anyway) and
for future debugging / error reporting actually include the error in
the task log.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
src/PVE/Network/SDN/Frr.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
index 7922e27cbfc0..d38a4180ff96 100644
--- a/src/PVE/Network/SDN/Frr.pm
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -68,10 +68,10 @@ sub reload {
if (-e $conf_file && -e $bin_path) {
eval {
- run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
+ run_command([$bin_path, '--stdout', '--reload', $conf_file], errfunc => $err);
};
if ($@) {
- warn "frr reload command fail. Restarting frr.";
+ warn "frr reload command fail: $@ Restarting frr.";
eval { run_command(['systemctl', 'restart', 'frr']); };
}
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration Gabriel Goller
@ 2025-04-02 10:37 ` Fabian Grünbichler
2025-04-02 10:42 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Fabian Grünbichler @ 2025-04-02 10:37 UTC (permalink / raw)
To: Proxmox VE development discussion
On March 28, 2025 6:13 pm, Gabriel Goller wrote:
> From: Stefan Hanreich <s.hanreich@proxmox.com>
>
> Reloading the FRR configuration failed, because outfunc was defined as
> an empty hash, but Tools.pm requires it to be a CODE reference, so the
> following error has been thrown on FRR reload:
>
> Not a CODE reference at /usr/share/perl5/PVE/Tools.pm line 577.
>
> Fix this by not providing an outfunc at all (it was empty anyway) and
> for future debugging / error reporting actually include the error in
> the task log.
>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> src/PVE/Network/SDN/Frr.pm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
> index 7922e27cbfc0..d38a4180ff96 100644
> --- a/src/PVE/Network/SDN/Frr.pm
> +++ b/src/PVE/Network/SDN/Frr.pm
> @@ -68,10 +68,10 @@ sub reload {
>
> if (-e $conf_file && -e $bin_path) {
> eval {
> - run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
> + run_command([$bin_path, '--stdout', '--reload', $conf_file], errfunc => $err);
this actually changes the behaviour though - I assume previously we
wanted output to be suppressed here? not specifying outfunc means output
is printed to stdout, unless quiet is set..
> };
> if ($@) {
> - warn "frr reload command fail. Restarting frr.";
> + warn "frr reload command fail: $@ Restarting frr.";
this should probably be two warnings now to remain readable?
> eval { run_command(['systemctl', 'restart', 'frr']); };
> }
> }
> --
> 2.39.5
>
>
>
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>
>
>
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration
2025-04-02 10:37 ` Fabian Grünbichler
@ 2025-04-02 10:42 ` Stefan Hanreich
0 siblings, 0 replies; 97+ messages in thread
From: Stefan Hanreich @ 2025-04-02 10:42 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Grünbichler
On 4/2/25 12:37, Fabian Grünbichler wrote:
> On March 28, 2025 6:13 pm, Gabriel Goller wrote:
>> From: Stefan Hanreich <s.hanreich@proxmox.com>
>>
>> Reloading the FRR configuration failed, because outfunc was defined as
>> an empty hash, but Tools.pm requires it to be a CODE reference, so the
>> following error has been thrown on FRR reload:
>>
>> Not a CODE reference at /usr/share/perl5/PVE/Tools.pm line 577.
>>
>> Fix this by not providing an outfunc at all (it was empty anyway) and
>> for future debugging / error reporting actually include the error in
>> the task log.
>>
>> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
>> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
>> ---
>> src/PVE/Network/SDN/Frr.pm | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm
>> index 7922e27cbfc0..d38a4180ff96 100644
>> --- a/src/PVE/Network/SDN/Frr.pm
>> +++ b/src/PVE/Network/SDN/Frr.pm
>> @@ -68,10 +68,10 @@ sub reload {
>>
>> if (-e $conf_file && -e $bin_path) {
>> eval {
>> - run_command([$bin_path, '--stdout', '--reload', $conf_file], outfunc => {}, errfunc => $err);
>> + run_command([$bin_path, '--stdout', '--reload', $conf_file], errfunc => $err);
>
> this actually changes the behaviour though - I assume previously we
> wanted output to be suppressed here? not specifying outfunc means output
> is printed to stdout, unless quiet is set..
>
yes, we figured it'd be good to have the actual frr-reload output in the
task log. Would make sense to at least mention this in the commit message.
>> };
>> if ($@) {
>> - warn "frr reload command fail. Restarting frr.";
>> + warn "frr reload command fail: $@ Restarting frr.";
>
> this should probably be two warnings now to remain readable?
>
will adjust!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-manager 1/7] api: use new generalized frr and etc network config helper functions
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (43 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel Gabriel Goller
` (8 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
pve-network added new generalized frr generation and
etc/network/interfaces generations methods. Starting with this series,
not only the zones plugin edits the /etc/network/interfaces.d/sdn file, but
the fabrics as well. The new fabrics are also implemented in rust, so
they are not a normal ControllerPlugin – that's why the frr generation
has also been factored out.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
PVE/API2/Network.pm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/PVE/API2/Network.pm b/PVE/API2/Network.pm
index 12ee6cca057f..f5b90baeeade 100644
--- a/PVE/API2/Network.pm
+++ b/PVE/API2/Network.pm
@@ -798,7 +798,7 @@ __PACKAGE__->register_method({
rename($new_config_file, $current_config_file) if -e $new_config_file;
if ($have_sdn) {
- PVE::Network::SDN::generate_zone_config();
+ PVE::Network::SDN::generate_etc_network_config();
PVE::Network::SDN::generate_dhcp_config();
}
@@ -811,7 +811,7 @@ __PACKAGE__->register_method({
PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err);
if ($have_sdn) {
- PVE::Network::SDN::generate_controller_config(1);
+ PVE::Network::SDN::generate_frr_config(1);
}
};
return $rpcenv->fork_worker('srvreload', 'networking', $authuser, $worker);
@@ -868,3 +868,5 @@ __PACKAGE__->register_method({
return undef;
}});
+
+1;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (44 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 1/7] api: use new generalized frr and etc network config helper functions Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 9:26 ` Friedrich Weber
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 3/7] fabrics: add additional interface fields for openfabric and ospf Gabriel Goller
` (7 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Implements a shared interface selector panel for openfabric and ospf fabrics.
This GridPanel combines data from two sources: the node network interfaces
(/nodes/<node>/network) and the fabrics section configuration, displaying
a merged view of both.
It implements the following warning states:
- When an interface has an IP address configured in /etc/network/interfaces,
we display a warning and disable the input field, prompting users to
configure addresses only via the fabrics interface
- When addresses exist in both /etc/network/interfaces and
/etc/network/interfaces.d/sdn, we show a warning without disabling the field,
allowing users to remove the SDN interface configuration while preserving
the underlying one
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/sdn/fabrics/Common.js | 285 +++++++++++++++++++++++++++++
2 files changed, 286 insertions(+)
create mode 100644 www/manager6/sdn/fabrics/Common.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index c94a5cdfbf70..7df96f58eb1f 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -303,6 +303,7 @@ JSSRC= \
sdn/zones/SimpleEdit.js \
sdn/zones/VlanEdit.js \
sdn/zones/VxlanEdit.js \
+ sdn/fabrics/Common.js \
storage/ContentView.js \
storage/BackupView.js \
storage/Base.js \
diff --git a/www/manager6/sdn/fabrics/Common.js b/www/manager6/sdn/fabrics/Common.js
new file mode 100644
index 000000000000..d71127d9c57f
--- /dev/null
+++ b/www/manager6/sdn/fabrics/Common.js
@@ -0,0 +1,285 @@
+Ext.define('PVE.sdn.Fabric.InterfacePanel', {
+ extend: 'Ext.grid.Panel',
+ mixins: ['Ext.form.field.Field'],
+
+ network_interfaces: undefined,
+ parentClass: undefined,
+
+ selectionChange: function(_grid, selection) {
+ let me = this;
+ me.value = me.getSelection().map((rec) => {
+ let submitValue = structuredClone(rec.data);
+ delete submitValue.selected;
+ delete submitValue.isDisabled;
+ delete submitValue.statusIcon;
+ delete submitValue.statusTooltip;
+ delete submitValue.type;
+ return PVE.Parser.printPropertyString(submitValue);
+ });
+ me.checkChange();
+ },
+
+ getValue: function() {
+ let me = this;
+ return me.value ?? [];
+ },
+
+ setValue: function(value) {
+ let me = this;
+
+ value ??= [];
+
+ me.updateSelectedInterfaces(value);
+
+ return me.mixins.field.setValue.call(me, value);
+ },
+
+ addInterfaces: function(fabricInterfaces) {
+ let me = this;
+ if (me.network_interfaces) {
+ let nodeInterfaces = me.network_interfaces
+ .map((elem) => {
+ const obj = {
+ name: elem.iface,
+ type: elem.type,
+ ip: elem.cidr,
+ ipv6: elem.cidr6,
+ };
+ return obj;
+ });
+
+ if (fabricInterfaces) {
+ // Map existing node interfaces with fabric data
+ nodeInterfaces = nodeInterfaces.map(i => {
+ let elem = fabricInterfaces.find(j => j.name === i.name);
+ if (elem) {
+ if ((elem.ip && i.ip) || (elem.ipv6 && i.ipv6)) {
+ i.statusIcon = 'warning fa-warning';
+ i.statusTooltip = gettext('Interface already has an address configured in /etc/network/interfaces');
+ } else if (i.ip || i.ipv6) {
+ i.statusIcon = 'warning fa-warning';
+ i.statusTooltip = gettext('Configure the ip-address using the fabrics interface');
+ i.isDisabled = true;
+ }
+ }
+ return Object.assign(i, elem);
+ });
+
+ // Add any fabric interface that doesn't exist in node_interfaces
+ for (const fabricIface of fabricInterfaces) {
+ if (!nodeInterfaces.some(nodeIface => nodeIface.name === fabricIface.name)) {
+ nodeInterfaces.push({
+ name: fabricIface.name,
+ statusIcon: 'warning fa-warning',
+ statusTooltip: gettext('Interface not found on node'),
+ ...fabricIface,
+ });
+ }
+ }
+ let store = me.getStore();
+ store.setData(nodeInterfaces);
+ } else {
+ let store = me.getStore();
+ store.setData(nodeInterfaces);
+ }
+ } else if (fabricInterfaces) {
+ // We could not get the available interfaces of the node, so we display the configured ones only.
+ let interfaces = fabricInterfaces.map((elem) => {
+ const obj = {
+ name: elem.name,
+ ...elem,
+ };
+ return obj;
+ });
+
+ let store = me.getStore();
+ store.setData(interfaces);
+ } else {
+ console.warn("no fabric_interfaces and cluster_interfaces available!");
+ }
+ },
+
+ updateSelectedInterfaces: function(values) {
+ let me = this;
+ if (values) {
+ let recs = [];
+ let store = me.getStore();
+
+ for (const i of values) {
+ let rec = store.getById(i.name);
+ if (rec) {
+ recs.push(rec);
+ }
+ }
+ me.suspendEvent('change');
+ me.setSelection();
+ me.setSelection(recs);
+ } else {
+ me.suspendEvent('change');
+ me.setSelection();
+ }
+ me.resumeEvent('change');
+ },
+
+ setNetworkInterfaces: function(network_interfaces) {
+ this.network_interfaces = network_interfaces;
+ },
+
+ getSubmitData: function() {
+ let records = this.getSelection().map((record) => {
+ let submitData = structuredClone(record.data);
+ delete submitData.selected;
+ delete submitData.isDisabled;
+ delete submitData.statusIcon;
+ delete submitData.statusTooltip;
+ delete submitData.type;
+
+ // Delete any properties that are null or undefined
+ Object.keys(submitData).forEach(function(key) {
+ if (submitData[key] === null || submitData[key] === undefined || submitData[key] === '') {
+ delete submitData[key];
+ }
+ });
+
+ return Proxmox.Utils.printPropertyString(submitData);
+ });
+ return {
+ 'interfaces': records,
+ };
+ },
+
+ controller: {
+ onValueChange: function(field, value) {
+ let me = this;
+ let record = field.getWidgetRecord();
+ let column = field.getWidgetColumn();
+ if (record) {
+ record.set(column.dataIndex, value);
+ record.commit();
+
+ me.getView().checkChange();
+ me.getView().selectionChange();
+ }
+ },
+
+ control: {
+ 'field': {
+ change: 'onValueChange',
+ },
+ },
+ },
+
+ selModel: {
+ type: 'checkboxmodel',
+ mode: 'SIMPLE',
+ },
+
+ listeners: {
+ selectionchange: function() {
+ this.selectionChange(...arguments);
+ },
+ },
+
+ commonColumns: [
+ {
+ text: gettext('Status'),
+ dataIndex: 'status',
+ width: 30,
+ renderer: function(value, metaData, record) {
+ let icon = record.data.statusIcon || '';
+ let tooltip = record.data.statusTooltip || '';
+
+ if (tooltip) {
+ metaData.tdAttr = 'data-qtip="' + Ext.htmlEncode(tooltip) + '"';
+ }
+
+ if (icon) {
+ return `<i class="fa ${icon}"></i>`;
+ }
+
+ return value || '';
+ },
+
+ },
+ {
+ text: gettext('Name'),
+ dataIndex: 'name',
+ flex: 2,
+ },
+ {
+ text: gettext('Type'),
+ dataIndex: 'type',
+ flex: 1,
+ },
+ {
+ text: gettext('IP'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'ip',
+ flex: 1,
+
+ widget: {
+ xtype: 'proxmoxtextfield',
+ isFormField: false,
+ bind: {
+ disabled: '{record.isDisabled}',
+ },
+ },
+ },
+ ],
+
+ additionalColumns: [],
+
+ initComponent: function() {
+ let me = this;
+
+ Ext.apply(me, {
+ store: Ext.create("Ext.data.Store", {
+ model: "Pve.sdn.Interface",
+ sorters: {
+ property: 'name',
+ direction: 'ASC',
+ },
+ }),
+ columns: me.commonColumns.concat(me.additionalColumns),
+ });
+
+ me.callParent();
+
+ Proxmox.Utils.monStoreErrors(me, me.getStore(), true);
+ me.initField();
+ },
+});
+
+
+Ext.define('Pve.sdn.Fabric', {
+ extend: 'Ext.data.Model',
+ idProperty: 'name',
+ fields: [
+ 'name',
+ 'type',
+ ],
+});
+
+Ext.define('Pve.sdn.Node', {
+ extend: 'Ext.data.Model',
+ idProperty: 'name',
+ fields: [
+ 'name',
+ 'fabric',
+ 'type',
+ ],
+});
+
+Ext.define('Pve.sdn.Interface', {
+ extend: 'Ext.data.Model',
+ idProperty: 'name',
+ fields: [
+ 'name',
+ 'ip',
+ 'ipv6',
+ 'passive',
+ 'hello_interval',
+ 'hello_multiplier',
+ 'csnp_interval',
+ ],
+});
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel Gabriel Goller
@ 2025-04-02 9:26 ` Friedrich Weber
2025-04-02 10:04 ` Gabriel Goller
0 siblings, 1 reply; 97+ messages in thread
From: Friedrich Weber @ 2025-04-02 9:26 UTC (permalink / raw)
To: Proxmox VE development discussion, Gabriel Goller
Hi, one minor comment inline:
On 28/03/2025 18:13, Gabriel Goller wrote:
> Implements a shared interface selector panel for openfabric and ospf fabrics.
> This GridPanel combines data from two sources: the node network interfaces
> (/nodes/<node>/network) and the fabrics section configuration, displaying
> a merged view of both.
>
> It implements the following warning states:
> - When an interface has an IP address configured in /etc/network/interfaces,
> we display a warning and disable the input field, prompting users to
> configure addresses only via the fabrics interface
> - When addresses exist in both /etc/network/interfaces and
> /etc/network/interfaces.d/sdn, we show a warning without disabling the field,
> allowing users to remove the SDN interface configuration while preserving
> the underlying one
>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
> ---
> www/manager6/Makefile | 1 +
> www/manager6/sdn/fabrics/Common.js | 285 +++++++++++++++++++++++++++++
> 2 files changed, 286 insertions(+)
> create mode 100644 www/manager6/sdn/fabrics/Common.js
>
> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
> index c94a5cdfbf70..7df96f58eb1f 100644
> --- a/www/manager6/Makefile
> +++ b/www/manager6/Makefile
> @@ -303,6 +303,7 @@ JSSRC= \
> sdn/zones/SimpleEdit.js \
> sdn/zones/VlanEdit.js \
> sdn/zones/VxlanEdit.js \
> + sdn/fabrics/Common.js \
> storage/ContentView.js \
> storage/BackupView.js \
> storage/Base.js \
> diff --git a/www/manager6/sdn/fabrics/Common.js b/www/manager6/sdn/fabrics/Common.js
> new file mode 100644
> index 000000000000..d71127d9c57f
> --- /dev/null
> +++ b/www/manager6/sdn/fabrics/Common.js
> @@ -0,0 +1,285 @@
> +Ext.define('PVE.sdn.Fabric.InterfacePanel', {
> + extend: 'Ext.grid.Panel',
> + mixins: ['Ext.form.field.Field'],
> +
> + network_interfaces: undefined,
> + parentClass: undefined,
> +
> + selectionChange: function(_grid, selection) {
> + let me = this;
> + me.value = me.getSelection().map((rec) => {
> + let submitValue = structuredClone(rec.data);
> + delete submitValue.selected;
> + delete submitValue.isDisabled;
> + delete submitValue.statusIcon;
> + delete submitValue.statusTooltip;
> + delete submitValue.type;
> + return PVE.Parser.printPropertyString(submitValue);
> + });
> + me.checkChange();
> + },
> +
> + getValue: function() {
> + let me = this;
> + return me.value ?? [];
> + },
> +
> + setValue: function(value) {
> + let me = this;
> +
> + value ??= [];
> +
> + me.updateSelectedInterfaces(value);
> +
> + return me.mixins.field.setValue.call(me, value);
> + },
> +
> + addInterfaces: function(fabricInterfaces) {
> + let me = this;
> + if (me.network_interfaces) {
> + let nodeInterfaces = me.network_interfaces
> + .map((elem) => {
> + const obj = {
> + name: elem.iface,
> + type: elem.type,
> + ip: elem.cidr,
> + ipv6: elem.cidr6,
> + };
> + return obj;
> + });
> +
> + if (fabricInterfaces) {
> + // Map existing node interfaces with fabric data
> + nodeInterfaces = nodeInterfaces.map(i => {
> + let elem = fabricInterfaces.find(j => j.name === i.name);
> + if (elem) {
> + if ((elem.ip && i.ip) || (elem.ipv6 && i.ipv6)) {
> + i.statusIcon = 'warning fa-warning';
> + i.statusTooltip = gettext('Interface already has an address configured in /etc/network/interfaces');
> + } else if (i.ip || i.ipv6) {
> + i.statusIcon = 'warning fa-warning';
> + i.statusTooltip = gettext('Configure the ip-address using the fabrics interface');
> + i.isDisabled = true;
> + }
> + }
> + return Object.assign(i, elem);
> + });
> +
> + // Add any fabric interface that doesn't exist in node_interfaces
> + for (const fabricIface of fabricInterfaces) {
> + if (!nodeInterfaces.some(nodeIface => nodeIface.name === fabricIface.name)) {
> + nodeInterfaces.push({
> + name: fabricIface.name,
> + statusIcon: 'warning fa-warning',
> + statusTooltip: gettext('Interface not found on node'),
> + ...fabricIface,
> + });
> + }
> + }
> + let store = me.getStore();
> + store.setData(nodeInterfaces);
> + } else {
> + let store = me.getStore();
> + store.setData(nodeInterfaces);
> + }
> + } else if (fabricInterfaces) {
> + // We could not get the available interfaces of the node, so we display the configured ones only.
> + let interfaces = fabricInterfaces.map((elem) => {
> + const obj = {
> + name: elem.name,
> + ...elem,
> + };
> + return obj;
> + });
> +
> + let store = me.getStore();
> + store.setData(interfaces);
> + } else {
> + console.warn("no fabric_interfaces and cluster_interfaces available!");
> + }
> + },
> +
> + updateSelectedInterfaces: function(values) {
> + let me = this;
> + if (values) {
> + let recs = [];
> + let store = me.getStore();
> +
> + for (const i of values) {
> + let rec = store.getById(i.name);
> + if (rec) {
> + recs.push(rec);
> + }
> + }
> + me.suspendEvent('change');
> + me.setSelection();
> + me.setSelection(recs);
> + } else {
> + me.suspendEvent('change');
> + me.setSelection();
> + }
> + me.resumeEvent('change');
> + },
> +
> + setNetworkInterfaces: function(network_interfaces) {
> + this.network_interfaces = network_interfaces;
> + },
> +
> + getSubmitData: function() {
> + let records = this.getSelection().map((record) => {
> + let submitData = structuredClone(record.data);
> + delete submitData.selected;
> + delete submitData.isDisabled;
> + delete submitData.statusIcon;
> + delete submitData.statusTooltip;
> + delete submitData.type;
> +
> + // Delete any properties that are null or undefined
> + Object.keys(submitData).forEach(function(key) {
> + if (submitData[key] === null || submitData[key] === undefined || submitData[key] === '') {
> + delete submitData[key];
> + }
> + });
> +
> + return Proxmox.Utils.printPropertyString(submitData);
> + });
> + return {
> + 'interfaces': records,
> + };
> + },
> +
> + controller: {
> + onValueChange: function(field, value) {
> + let me = this;
> + let record = field.getWidgetRecord();
> + let column = field.getWidgetColumn();
> + if (record) {
> + record.set(column.dataIndex, value);
> + record.commit();
> +
> + me.getView().checkChange();
> + me.getView().selectionChange();
> + }
> + },
> +
> + control: {
> + 'field': {
> + change: 'onValueChange',
> + },
> + },
> + },
> +
> + selModel: {
> + type: 'checkboxmodel',
> + mode: 'SIMPLE',
> + },
> +
> + listeners: {
> + selectionchange: function() {
> + this.selectionChange(...arguments);
> + },
> + },
> +
> + commonColumns: [
> + {
> + text: gettext('Status'),
> + dataIndex: 'status',
> + width: 30,
> + renderer: function(value, metaData, record) {
> + let icon = record.data.statusIcon || '';
> + let tooltip = record.data.statusTooltip || '';
> +
> + if (tooltip) {
> + metaData.tdAttr = 'data-qtip="' + Ext.htmlEncode(tooltip) + '"';
> + }
Tooltips need to be double-encoded [1], so one htmlEncode might be missing here.
[1] https://git.proxmox.com/?p=pve-manager.git;a=commit;h=f08f08a042cec0124f73199dcda0d8f882e14507
> +
> + if (icon) {
> + return `<i class="fa ${icon}"></i>`;
> + }
> +
> + return value || '';
> + },
> +
> + },
> + {
> + text: gettext('Name'),
> + dataIndex: 'name',
> + flex: 2,
> + },
> + {
> + text: gettext('Type'),
> + dataIndex: 'type',
> + flex: 1,
> + },
> + {
> + text: gettext('IP'),
> + xtype: 'widgetcolumn',
> + dataIndex: 'ip',
> + flex: 1,
> +
> + widget: {
> + xtype: 'proxmoxtextfield',
> + isFormField: false,
> + bind: {
> + disabled: '{record.isDisabled}',
> + },
> + },
> + },
> + ],
> +
> + additionalColumns: [],
> +
> + initComponent: function() {
> + let me = this;
> +
> + Ext.apply(me, {
> + store: Ext.create("Ext.data.Store", {
> + model: "Pve.sdn.Interface",
> + sorters: {
> + property: 'name',
> + direction: 'ASC',
> + },
> + }),
> + columns: me.commonColumns.concat(me.additionalColumns),
> + });
> +
> + me.callParent();
> +
> + Proxmox.Utils.monStoreErrors(me, me.getStore(), true);
> + me.initField();
> + },
> +});
> +
> +
> +Ext.define('Pve.sdn.Fabric', {
> + extend: 'Ext.data.Model',
> + idProperty: 'name',
> + fields: [
> + 'name',
> + 'type',
> + ],
> +});
> +
> +Ext.define('Pve.sdn.Node', {
> + extend: 'Ext.data.Model',
> + idProperty: 'name',
> + fields: [
> + 'name',
> + 'fabric',
> + 'type',
> + ],
> +});
> +
> +Ext.define('Pve.sdn.Interface', {
> + extend: 'Ext.data.Model',
> + idProperty: 'name',
> + fields: [
> + 'name',
> + 'ip',
> + 'ipv6',
> + 'passive',
> + 'hello_interval',
> + 'hello_multiplier',
> + 'csnp_interval',
> + ],
> +});
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel
2025-04-02 9:26 ` Friedrich Weber
@ 2025-04-02 10:04 ` Gabriel Goller
2025-04-02 10:10 ` Friedrich Weber
0 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-04-02 10:04 UTC (permalink / raw)
To: Friedrich Weber; +Cc: Proxmox VE development discussion
On 02.04.2025 11:26, Friedrich Weber wrote:
>> + commonColumns: [
>> + {
>> + text: gettext('Status'),
>> + dataIndex: 'status',
>> + width: 30,
>> + renderer: function(value, metaData, record) {
>> + let icon = record.data.statusIcon || '';
>> + let tooltip = record.data.statusTooltip || '';
>> +
>> + if (tooltip) {
>> + metaData.tdAttr = 'data-qtip="' + Ext.htmlEncode(tooltip) + '"';
>> + }
>
>Tooltips need to be double-encoded [1], so one htmlEncode might be missing here.
>
>[1] https://git.proxmox.com/?p=pve-manager.git;a=commit;h=f08f08a042cec0124f73199dcda0d8f882e14507
Ah, so:
metaData.tdAttr = 'data-qtip="' + Ext.htmlEncode(Ext.htmlEncode(tooltip)) + '"';
?
Thanks for the review!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel
2025-04-02 10:04 ` Gabriel Goller
@ 2025-04-02 10:10 ` Friedrich Weber
0 siblings, 0 replies; 97+ messages in thread
From: Friedrich Weber @ 2025-04-02 10:10 UTC (permalink / raw)
To: Proxmox VE development discussion
On 02/04/2025 12:04, Gabriel Goller wrote:
> On 02.04.2025 11:26, Friedrich Weber wrote:
>>> + commonColumns: [
>>> + {
>>> + text: gettext('Status'),
>>> + dataIndex: 'status',
>>> + width: 30,
>>> + renderer: function(value, metaData, record) {
>>> + let icon = record.data.statusIcon || '';
>>> + let tooltip = record.data.statusTooltip || '';
>>> +
>>> + if (tooltip) {
>>> + metaData.tdAttr = 'data-qtip="' + Ext.htmlEncode(tooltip) + '"';
>>> + }
>>
>> Tooltips need to be double-encoded [1], so one htmlEncode might be missing here.
>>
>> [1] https://git.proxmox.com/?p=pve-manager.git;a=commit;h=f08f08a042cec0124f73199dcda0d8f882e14507
>
> Ah, so:
>
> metaData.tdAttr = 'data-qtip="' + Ext.htmlEncode(Ext.htmlEncode(tooltip)) + '"';
>
> ?
As long as `tooltip` isn't supposed to contain HTML and if I recall correctly, yes.
... and nit: While at it, this could use string interpolation to make it more readable :)
> Thanks for the review!
Sure!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-manager 3/7] fabrics: add additional interface fields for openfabric and ospf
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (45 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 4/7] fabrics: add FabricEdit components Gabriel Goller
` (6 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add InterfacePanel components for openfabric and ospf. These hold the
additional options which are protocol specific and are not shared. For
example the Hello Interval is openfabric specific.
Most of these are also hidden as to not clutter the interface too much.
There are also rarely used – most often the user sets a global property
which is automatically inherited by all interfaces.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
www/manager6/Makefile | 2 +
.../sdn/fabrics/openfabric/InterfaceEdit.js | 64 +++++++++++++++++++
.../sdn/fabrics/ospf/InterfaceEdit.js | 27 ++++++++
3 files changed, 93 insertions(+)
create mode 100644 www/manager6/sdn/fabrics/openfabric/InterfaceEdit.js
create mode 100644 www/manager6/sdn/fabrics/ospf/InterfaceEdit.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 7df96f58eb1f..b75a455d70e6 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -304,6 +304,8 @@ JSSRC= \
sdn/zones/VlanEdit.js \
sdn/zones/VxlanEdit.js \
sdn/fabrics/Common.js \
+ sdn/fabrics/openfabric/InterfaceEdit.js \
+ sdn/fabrics/ospf/InterfaceEdit.js \
storage/ContentView.js \
storage/BackupView.js \
storage/Base.js \
diff --git a/www/manager6/sdn/fabrics/openfabric/InterfaceEdit.js b/www/manager6/sdn/fabrics/openfabric/InterfaceEdit.js
new file mode 100644
index 000000000000..6d6e0797becc
--- /dev/null
+++ b/www/manager6/sdn/fabrics/openfabric/InterfaceEdit.js
@@ -0,0 +1,64 @@
+Ext.define('PVE.sdn.Fabric.OpenFabric.InterfacePanel', {
+ extend: 'PVE.sdn.Fabric.InterfacePanel',
+
+ additionalColumns: [
+ {
+ text: gettext('IPv6'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'ipv6',
+ flex: 1,
+ widget: {
+ xtype: 'proxmoxtextfield',
+ isFormField: false,
+ bind: {
+ disabled: '{record.isDisabled}',
+ },
+ },
+ },
+ {
+ text: gettext('Passive'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'passive',
+ flex: 2,
+ hidden: true,
+ widget: {
+ xtype: 'checkbox',
+ isFormField: false,
+ },
+ },
+ {
+ text: gettext('Hello Interval'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'hello_interval',
+ flex: 2,
+ hidden: true,
+ widget: {
+ xtype: 'proxmoxintegerfield',
+ isFormField: false,
+ },
+ },
+ {
+ text: gettext('Hello Multiplier'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'hello_multiplier',
+ flex: 2,
+ hidden: true,
+ widget: {
+ xtype: 'proxmoxintegerfield',
+ isFormField: false,
+ },
+ },
+ {
+ text: gettext('CSNP Interval'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'csnp_interval',
+ flex: 2,
+ hidden: true,
+ widget: {
+ xtype: 'proxmoxintegerfield',
+ isFormField: false,
+ },
+ },
+ ],
+});
+
diff --git a/www/manager6/sdn/fabrics/ospf/InterfaceEdit.js b/www/manager6/sdn/fabrics/ospf/InterfaceEdit.js
new file mode 100644
index 000000000000..af4577c21e38
--- /dev/null
+++ b/www/manager6/sdn/fabrics/ospf/InterfaceEdit.js
@@ -0,0 +1,27 @@
+Ext.define('PVE.sdn.Fabric.Ospf.InterfacePanel', {
+ extend: 'PVE.sdn.Fabric.InterfacePanel',
+
+ additionalColumns: [
+ {
+ text: gettext('Passive'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'passive',
+ flex: 1,
+ hidden: true,
+ widget: {
+ xtype: 'checkbox',
+ isFormField: false,
+ },
+ },
+ {
+ text: gettext('Unnumbered'),
+ xtype: 'widgetcolumn',
+ dataIndex: 'unnumbered',
+ flex: 1,
+ widget: {
+ xtype: 'checkbox',
+ isFormField: false,
+ },
+ },
+ ],
+});
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-manager 4/7] fabrics: add FabricEdit components
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (46 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 3/7] fabrics: add additional interface fields for openfabric and ospf Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components Gabriel Goller
` (5 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add FabricEdit components for openfabric and ospf. These are used to
create and edit fabrics. When editing, everything is disabled except the
hello_interval property, mostly because making the area/router_id and
the loopback_prefix editable would be kinda hard (i.e. we'd need to
force the user to delete the fabrics, or revalidate stuff).
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
www/manager6/Makefile | 2 +
.../sdn/fabrics/openfabric/FabricEdit.js | 71 +++++++++++++++++++
www/manager6/sdn/fabrics/ospf/FabricEdit.js | 64 +++++++++++++++++
3 files changed, 137 insertions(+)
create mode 100644 www/manager6/sdn/fabrics/openfabric/FabricEdit.js
create mode 100644 www/manager6/sdn/fabrics/ospf/FabricEdit.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index b75a455d70e6..04f00b270fba 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -304,7 +304,9 @@ JSSRC= \
sdn/zones/VlanEdit.js \
sdn/zones/VxlanEdit.js \
sdn/fabrics/Common.js \
+ sdn/fabrics/openfabric/FabricEdit.js \
sdn/fabrics/openfabric/InterfaceEdit.js \
+ sdn/fabrics/ospf/FabricEdit.js \
sdn/fabrics/ospf/InterfaceEdit.js \
storage/ContentView.js \
storage/BackupView.js \
diff --git a/www/manager6/sdn/fabrics/openfabric/FabricEdit.js b/www/manager6/sdn/fabrics/openfabric/FabricEdit.js
new file mode 100644
index 000000000000..672adf45581f
--- /dev/null
+++ b/www/manager6/sdn/fabrics/openfabric/FabricEdit.js
@@ -0,0 +1,71 @@
+Ext.define('PVE.sdn.Fabric.OpenFabric.Fabric.Edit', {
+ extend: 'Proxmox.window.Edit',
+ xtype: 'pveSDNOpenFabricRouteEdit',
+
+ subject: gettext('Add OpenFabric'),
+
+ onlineHelp: 'pvesdn_openfabric_fabric',
+
+ url: '/cluster/sdn/fabrics/openfabric',
+
+ isCreate: undefined,
+
+ viewModel: {
+ data: {
+ isCreate: true,
+ },
+ },
+
+ items: [
+ {
+ xtype: 'textfield',
+ fieldLabel: gettext('Name'),
+ labelWidth: 120,
+ name: 'fabric_id',
+ allowBlank: false,
+ bind: {
+ disabled: '{!isCreate}',
+ },
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: gettext('Loopback IP Prefix'),
+ labelWidth: 120,
+ name: 'loopback_prefix',
+ allowBlank: false,
+ bind: {
+ disabled: '{!isCreate}',
+ },
+ },
+ {
+ xtype: 'proxmoxintegerfield',
+ fieldLabel: gettext('Hello Interval'),
+ labelWidth: 120,
+ name: 'hello_interval',
+ allowBlank: true,
+ },
+ ],
+
+ submitUrl: function(url, values) {
+ let me = this;
+ return `${me.url}`;
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ let view = me.getViewModel();
+ view.set('isCreate', me.isCreate);
+
+ me.method = me.isCreate ? 'POST' : 'PUT';
+ me.callParent();
+
+ if (!me.isCreate) {
+ me.load({
+ success: function(response, opts) {
+ me.setValues(response.result.data);
+ },
+ });
+ }
+ },
+});
diff --git a/www/manager6/sdn/fabrics/ospf/FabricEdit.js b/www/manager6/sdn/fabrics/ospf/FabricEdit.js
new file mode 100644
index 000000000000..a229e688c9e6
--- /dev/null
+++ b/www/manager6/sdn/fabrics/ospf/FabricEdit.js
@@ -0,0 +1,64 @@
+Ext.define('PVE.sdn.Fabric.Ospf.Fabric.Edit', {
+ extend: 'Proxmox.window.Edit',
+ xtype: 'pveSDNOpenFabricRouteEdit',
+
+ subject: gettext('Add OSPF'),
+
+ onlineHelp: 'pvesdn_ospf_fabric',
+
+ url: '/cluster/sdn/fabrics/ospf',
+
+ isCreate: undefined,
+
+ viewModel: {
+ data: {
+ isCreate: true,
+ },
+ },
+
+ items: [
+ {
+ xtype: 'textfield',
+ fieldLabel: gettext('Area'),
+ labelWidth: 120,
+ name: 'area',
+ allowBlank: false,
+ bind: {
+ disabled: '{!isCreate}',
+ },
+ },
+ {
+ xtype: 'textfield',
+ fieldLabel: gettext('Loopback IP Prefix'),
+ labelWidth: 120,
+ name: 'loopback_prefix',
+ allowBlank: false,
+ bind: {
+ disabled: '{!isCreate}',
+ },
+ },
+ ],
+
+ submitUrl: function(url, values) {
+ let me = this;
+ return `${me.url}`;
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ let view = me.getViewModel();
+ view.set('isCreate', me.isCreate);
+
+ me.method = me.isCreate ? 'POST' : 'PUT';
+
+ me.callParent();
+ if (!me.isCreate) {
+ me.load({
+ success: function(response, opts) {
+ me.setValues(response.result.data);
+ },
+ });
+ }
+ },
+});
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (47 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 4/7] fabrics: add FabricEdit components Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-03 9:16 ` Christoph Heiss
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView Gabriel Goller
` (4 subsequent siblings)
53 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add NodeEdit components for OpenFabric and OSPF. These allow creation
and editing of Nodes and their interfaces. Shows an interface-panel with
all the available and configured interfaces. If a node is not available
but it is configured, it can still be viewed (we also show a warning
hint).
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
www/manager6/Makefile | 2 +
.../sdn/fabrics/openfabric/NodeEdit.js | 205 +++++++++++++++++
www/manager6/sdn/fabrics/ospf/NodeEdit.js | 207 ++++++++++++++++++
3 files changed, 414 insertions(+)
create mode 100644 www/manager6/sdn/fabrics/openfabric/NodeEdit.js
create mode 100644 www/manager6/sdn/fabrics/ospf/NodeEdit.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 04f00b270fba..7ed2839d9557 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -305,8 +305,10 @@ JSSRC= \
sdn/zones/VxlanEdit.js \
sdn/fabrics/Common.js \
sdn/fabrics/openfabric/FabricEdit.js \
+ sdn/fabrics/openfabric/NodeEdit.js \
sdn/fabrics/openfabric/InterfaceEdit.js \
sdn/fabrics/ospf/FabricEdit.js \
+ sdn/fabrics/ospf/NodeEdit.js \
sdn/fabrics/ospf/InterfaceEdit.js \
storage/ContentView.js \
storage/BackupView.js \
diff --git a/www/manager6/sdn/fabrics/openfabric/NodeEdit.js b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js
new file mode 100644
index 000000000000..f2d204c22542
--- /dev/null
+++ b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js
@@ -0,0 +1,205 @@
+Ext.define('PVE.sdn.Fabric.OpenFabric.Node.InputPanel', {
+ extend: 'Proxmox.panel.InputPanel',
+
+ viewModel: {},
+
+ isCreate: undefined,
+ loadClusterInterfaces: undefined,
+
+ interface_selector: undefined,
+ node_not_accessible_warning: undefined,
+
+ onSetValues: function(values) {
+ let me = this;
+ me.interface_selector.setNetworkInterfaces(values.network_interfaces);
+ if (values.node) {
+ // this means we are in edit mode and we have a config
+ me.interface_selector.addInterfaces(values.node.interface);
+ me.interface_selector.updateSelectedInterfaces(values.node.interface);
+ me.interface_selector.originalValue = values.node.interface;
+ return {
+ node: values.node.node_id.split("_")[1],
+ router_id: values.node.router_id,
+ interfaces: values.node.interface,
+ };
+ } else if (values.router_id) {
+ // if only a single router_id is set, we only want to update
+ // that parameter, without reloading the interface panel.
+ return { router_id: values.router_id };
+ } else {
+ // this means we are in create mode, so don't select any interfaces
+ me.interface_selector.addInterfaces(null);
+ me.interface_selector.updateSelectedInterfaces(null);
+ return {};
+ }
+ },
+
+ initComponent: function() {
+ let me = this;
+ me.interface_selector = Ext.create('PVE.sdn.Fabric.OpenFabric.InterfacePanel', {
+ name: 'interfaces',
+ parentClass: me.isCreate ? me : undefined,
+ });
+ me.items = [
+ {
+ xtype: 'pveNodeSelector',
+ reference: 'nodeselector',
+ fieldLabel: gettext('Node'),
+ labelWidth: 120,
+ name: 'node',
+ allowBlank: false,
+ disabled: !me.isCreate,
+ onlineValidator: me.isCreate,
+ autoSelect: me.isCreate,
+ listeners: {
+ change: function(f, value) {
+ if (me.isCreate) {
+ me.loadClusterInterfaces(value, (result) => {
+ me.setValues({ network_interfaces: result });
+ });
+ }
+ },
+ },
+ listConfig: {
+ columns: [
+ {
+ header: gettext('Node'),
+ dataIndex: 'node',
+ sortable: true,
+ hideable: false,
+ flex: 1,
+ },
+ ],
+ },
+
+ },
+ me.node_not_accessible_warning,
+ {
+ xtype: 'textfield',
+ fieldLabel: gettext('Loopback IP'),
+ labelWidth: 120,
+ name: 'router_id',
+ allowBlank: false,
+ },
+ me.interface_selector,
+ ];
+ me.callParent();
+ },
+});
+
+Ext.define('PVE.sdn.Fabric.OpenFabric.Node.Edit', {
+ extend: 'Proxmox.window.Edit',
+ xtype: 'pveSDNFabricAddNode',
+
+ width: 800,
+
+ url: '/cluster/sdn/fabrics/openfabric',
+
+ onlineHelp: 'pvesdn_openfabric_fabric',
+
+ isCreate: undefined,
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+ },
+
+
+ submitUrl: function(url, values) {
+ let me = this;
+ return `${me.url}/${me.extraRequestParams.fabric}/node/${values.node}`;
+ },
+
+ loadClusterInterfaces: function(node, onSuccess) {
+ Proxmox.Utils.API2Request({
+ url: `/api2/extjs/nodes/${node}/network`,
+ method: 'GET',
+ success: function(response, _opts) {
+ onSuccess(response.result.data);
+ },
+ // No failure callback because this api call can't fail, it
+ // just hangs the request :) (if the node doesn't exist it gets proxied)
+ });
+ },
+ loadFabricInterfaces: function(fabric, node, onSuccess, onFailure) {
+ Proxmox.Utils.API2Request({
+ url: `/cluster/sdn/fabrics/openfabric/${fabric}/node/${node}`,
+ method: 'GET',
+ success: function(response, _opts) {
+ onSuccess(response.result.data);
+ },
+ failure: onFailure,
+ });
+ },
+ loadAllAvailableNodes: function(onSuccess) {
+ Proxmox.Utils.API2Request({
+ url: `/cluster/config/nodes`,
+ method: 'GET',
+ success: function(response, _opts) {
+ onSuccess(response.result.data);
+ },
+ });
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ me.node_not_accessible_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
+ userCls: 'pmx-hint',
+ value: gettext('The node is not accessible.'),
+ hidden: true,
+ });
+
+ let ipanel = Ext.create('PVE.sdn.Fabric.OpenFabric.Node.InputPanel', {
+ node_not_accessible_warning: me.node_not_accessible_warning,
+ isCreate: me.isCreate,
+ loadClusterInterfaces: me.loadClusterInterfaces,
+ });
+
+ Ext.apply(me, {
+ subject: gettext('Node'),
+ items: [ipanel],
+ });
+
+ me.callParent();
+
+ if (!me.isCreate) {
+ me.loadAllAvailableNodes((allNodes) => {
+ if (allNodes.some(i => i.name === me.node)) {
+ me.loadClusterInterfaces(me.node, (clusterResult) => {
+ me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
+ fabricResult.interface = fabricResult.interface
+ .map(i => PVE.Parser.parsePropertyString(i));
+
+ let data = {
+ node: fabricResult,
+ network_interfaces: clusterResult,
+ };
+
+ ipanel.setValues(data);
+ });
+ });
+ } else {
+ me.node_not_accessible_warning.setHidden(false);
+ // If the node is not currently in the cluster and not available (we can't get it's interfaces).
+ me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
+ fabricResult.interface = fabricResult.interface
+ .map(i => PVE.Parser.parsePropertyString(i));
+
+ let data = {
+ node: fabricResult,
+ };
+
+ ipanel.setValues(data);
+ });
+ }
+ });
+ }
+
+ if (me.isCreate) {
+ me.method = 'POST';
+ } else {
+ me.method = 'PUT';
+ }
+ },
+});
+
diff --git a/www/manager6/sdn/fabrics/ospf/NodeEdit.js b/www/manager6/sdn/fabrics/ospf/NodeEdit.js
new file mode 100644
index 000000000000..d022272b5428
--- /dev/null
+++ b/www/manager6/sdn/fabrics/ospf/NodeEdit.js
@@ -0,0 +1,207 @@
+Ext.define('PVE.sdn.Fabric.Ospf.Node.InputPanel', {
+ extend: 'Proxmox.panel.InputPanel',
+
+ viewModel: {},
+
+ isCreate: undefined,
+ loadClusterInterfaces: undefined,
+
+ interface_selector: undefined,
+ node_not_accessible_warning: undefined,
+
+ onSetValues: function(values) {
+ let me = this;
+ me.interface_selector.setNetworkInterfaces(values.network_interfaces);
+ if (values.node) {
+ // this means we are in edit mode and we have a config
+ me.interface_selector.addInterfaces(values.node.interface);
+ me.interface_selector.updateSelectedInterfaces(values.node.interface);
+ me.interface_selector.originalValue = values.node.interface;
+ return {
+ node: values.node.node_id.split("_")[1],
+ router_id: values.node.router_id,
+ interfaces: values.node.interface,
+ };
+ } else if (values.router_id) {
+ // if only a single router_id is set, we only want to update
+ // that parameter, without reloading the interface panel.
+ return { router_id: values.router_id };
+ } else {
+ // this means we are in create mode, so don't select any interfaces
+ me.interface_selector.addInterfaces(null);
+ me.interface_selector.updateSelectedInterfaces(null);
+ return {};
+ }
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ me.interface_selector = Ext.create('PVE.sdn.Fabric.Ospf.InterfacePanel', {
+ name: 'interfaces',
+ parentClass: me.isCreate ? me : undefined,
+ });
+
+ me.items = [
+ {
+ xtype: 'pveNodeSelector',
+ reference: 'nodeselector',
+ fieldLabel: gettext('Node'),
+ labelWidth: 120,
+ name: 'node',
+ allowBlank: false,
+ disabled: !me.isCreate,
+ onlineValidator: me.isCreate,
+ autoSelect: me.isCreate,
+ listeners: {
+ change: function(f, value) {
+ if (me.isCreate) {
+ me.loadClusterInterfaces(value, (result) => {
+ me.setValues({ network_interfaces: result });
+ });
+ }
+ },
+ },
+ listConfig: {
+ columns: [
+ {
+ header: gettext('Node'),
+ dataIndex: 'node',
+ sortable: true,
+ hideable: false,
+ flex: 1,
+ },
+ ],
+ },
+
+ },
+ me.node_not_accessible_warning,
+ {
+ xtype: 'textfield',
+ fieldLabel: gettext('Loopback IP'),
+ labelWidth: 120,
+ name: 'router_id',
+ allowBlank: false,
+ },
+ me.interface_selector,
+ ];
+ me.callParent();
+ },
+});
+
+Ext.define('PVE.sdn.Fabric.Ospf.Node.Edit', {
+ extend: 'Proxmox.window.Edit',
+ xtype: 'pveSDNFabricAddNode',
+
+ width: 800,
+
+ url: '/cluster/sdn/fabrics/ospf',
+ onlineHelp: 'pvesdn_ospf_node',
+
+
+ isCreate: undefined,
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+ },
+
+ submitUrl: function(url, values) {
+ let me = this;
+ return `${me.url}/${me.extraRequestParams.fabric}/node/${values.node}`;
+ },
+
+ loadClusterInterfaces: function(node, onSuccess) {
+ Proxmox.Utils.API2Request({
+ url: `/api2/extjs/nodes/${node}/network`,
+ method: 'GET',
+ success: function(response, _opts) {
+ onSuccess(response.result.data);
+ },
+ // No failure callback because this api call can't fail, it
+ // just hangs the request :) (if the node doesn't exist it gets proxied)
+ });
+ },
+ loadFabricInterfaces: function(fabric, node, onSuccess, onFailure) {
+ Proxmox.Utils.API2Request({
+ url: `/cluster/sdn/fabrics/ospf/${fabric}/node/${node}`,
+ method: 'GET',
+ success: function(response, _opts) {
+ onSuccess(response.result.data);
+ },
+ failure: onFailure,
+ });
+ },
+ loadAllAvailableNodes: function(onSuccess) {
+ Proxmox.Utils.API2Request({
+ url: `/cluster/config/nodes`,
+ method: 'GET',
+ success: function(response, _opts) {
+ onSuccess(response.result.data);
+ },
+ });
+ },
+
+ initComponent: function() {
+ let me = this;
+
+ me.node_not_accessible_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
+ userCls: 'pmx-hint',
+ value: gettext('The node is not accessible.'),
+ hidden: true,
+ });
+
+
+ let ipanel = Ext.create('PVE.sdn.Fabric.Ospf.Node.InputPanel', {
+ interface_selector: me.interface_selector,
+ node_not_accessible_warning: me.node_not_accessible_warning,
+ isCreate: me.isCreate,
+ loadClusterInterfaces: me.loadClusterInterfaces,
+ });
+
+ Ext.apply(me, {
+ subject: gettext('Node'),
+ items: [ipanel],
+ });
+
+ me.callParent();
+
+ if (!me.isCreate) {
+ me.loadAllAvailableNodes((allNodes) => {
+ if (allNodes.some(i => i.name === me.node)) {
+ me.loadClusterInterfaces(me.node, (clusterResult) => {
+ me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
+ fabricResult.interface = fabricResult.interface
+ .map(i => PVE.Parser.parsePropertyString(i));
+
+ let data = {
+ node: fabricResult,
+ network_interfaces: clusterResult,
+ };
+
+ ipanel.setValues(data);
+ });
+ });
+ } else {
+ me.node_not_accessible_warning.setHidden(false);
+ // If the node is not currently in the cluster and not available (we can't get it's interfaces).
+ me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
+ fabricResult.interface = fabricResult.interface
+ .map(i => PVE.Parser.parsePropertyString(i));
+
+ let data = {
+ node: fabricResult,
+ };
+
+ ipanel.setValues(data);
+ });
+ }
+ });
+ }
+
+ if (me.isCreate) {
+ me.method = 'POST';
+ } else {
+ me.method = 'PUT';
+ }
+ },
+});
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components Gabriel Goller
@ 2025-04-03 9:16 ` Christoph Heiss
2025-04-04 15:45 ` Gabriel Goller
0 siblings, 1 reply; 97+ messages in thread
From: Christoph Heiss @ 2025-04-03 9:16 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox VE development discussion
On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
[..]
> diff --git a/www/manager6/sdn/fabrics/openfabric/NodeEdit.js b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js
> new file mode 100644
> index 000000000000..f2d204c22542
> --- /dev/null
> +++ b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js
> @@ -0,0 +1,205 @@
> +Ext.define('PVE.sdn.Fabric.OpenFabric.Node.InputPanel', {
> + extend: 'Proxmox.panel.InputPanel',
> +
> + viewModel: {},
> +
> + isCreate: undefined,
> + loadClusterInterfaces: undefined,
> +
> + interface_selector: undefined,
> + node_not_accessible_warning: undefined,
All new variables should be camelCase [0] here too, as noted in a later
patch.
[0] https://pve.proxmox.com/wiki/Javascript_Style_Guide#Casing
> +
[..]
> + initComponent: function() {
> + let me = this;
> + me.interface_selector = Ext.create('PVE.sdn.Fabric.OpenFabric.InterfacePanel', {
> + name: 'interfaces',
> + parentClass: me.isCreate ? me : undefined,
> + });
> + me.items = [
> + {
> + xtype: 'pveNodeSelector',
> + reference: 'nodeselector',
> + fieldLabel: gettext('Node'),
> + labelWidth: 120,
> + name: 'node',
> + allowBlank: false,
> + disabled: !me.isCreate,
> + onlineValidator: me.isCreate,
> + autoSelect: me.isCreate,
> + listeners: {
> + change: function(f, value) {
> + if (me.isCreate) {
> + me.loadClusterInterfaces(value, (result) => {
> + me.setValues({ network_interfaces: result });
> + });
> + }
> + },
> + },
> + listConfig: {
> + columns: [
> + {
> + header: gettext('Node'),
> + dataIndex: 'node',
> + sortable: true,
> + hideable: false,
> + flex: 1,
> + },
> + ],
> + },
For the node selector, it would be great if existing nodes could be
excluded from the dropdown. It isn't possible anyway and throws an error
on submit, so excluding them here would be good UX.
The `allowedNodes` and/or `disallowedNodes` properties on the
selector can be used for this.
> +
> + },
> + me.node_not_accessible_warning,
> + {
> + xtype: 'textfield',
> + fieldLabel: gettext('Loopback IP'),
> + labelWidth: 120,
> + name: 'router_id',
> + allowBlank: false,
> + },
Here, the user-visible name is 'Loopback IP', internally it is named
'Router ID'. In the documentation, 'Router-ID' is used too in the
associated documentation.
Perhaps just settle on Router-ID? As long as it is explained in the
documentation (maybe also add a tooltip?), I wouldn't use a separate
name IMHO.
> + me.interface_selector,
> + ];
> + me.callParent();
> + },
> +});
> +
> +Ext.define('PVE.sdn.Fabric.OpenFabric.Node.Edit', {
> + extend: 'Proxmox.window.Edit',
> + xtype: 'pveSDNFabricAddNode',
[..]
> +
> + initComponent: function() {
> + let me = this;
> +
> + me.node_not_accessible_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
> + userCls: 'pmx-hint',
> + value: gettext('The node is not accessible.'),
> + hidden: true,
> + });
> +
> + let ipanel = Ext.create('PVE.sdn.Fabric.OpenFabric.Node.InputPanel', {
> + node_not_accessible_warning: me.node_not_accessible_warning,
> + isCreate: me.isCreate,
> + loadClusterInterfaces: me.loadClusterInterfaces,
> + });
> +
> + Ext.apply(me, {
> + subject: gettext('Node'),
Can be moved to a direct member assignment outside of initComponent().
> + items: [ipanel],
> + });
> +
> + me.callParent();
> +
> + if (!me.isCreate) {
> + me.loadAllAvailableNodes((allNodes) => {
> + if (allNodes.some(i => i.name === me.node)) {
> + me.loadClusterInterfaces(me.node, (clusterResult) => {
> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
> + fabricResult.interface = fabricResult.interface
> + .map(i => PVE.Parser.parsePropertyString(i));
> +
> + let data = {
> + node: fabricResult,
> + network_interfaces: clusterResult,
> + };
> +
> + ipanel.setValues(data);
> + });
> + });
nit: perhaps move some of this into functions? This is pretty deeply
nested at this point. Would make it definitely more readable.
> + } else {
> + me.node_not_accessible_warning.setHidden(false);
> + // If the node is not currently in the cluster and not available (we can't get it's interfaces).
> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
> + fabricResult.interface = fabricResult.interface
> + .map(i => PVE.Parser.parsePropertyString(i));
> +
> + let data = {
> + node: fabricResult,
> + };
> +
> + ipanel.setValues(data);
> + });
> + }
> + });
Seems oddly similar to the above, could this be simplified/abstracted a
bit over both? If its feasible, of course.
> + }
> +
> + if (me.isCreate) {
> + me.method = 'POST';
> + } else {
> + me.method = 'PUT';
> + }
> + },
> +});
> +
> diff --git a/www/manager6/sdn/fabrics/ospf/NodeEdit.js b/www/manager6/sdn/fabrics/ospf/NodeEdit.js
> new file mode 100644
> index 000000000000..d022272b5428
> --- /dev/null
> +++ b/www/manager6/sdn/fabrics/ospf/NodeEdit.js
> @@ -0,0 +1,207 @@
> +Ext.define('PVE.sdn.Fabric.Ospf.Node.InputPanel', {
> + extend: 'Proxmox.panel.InputPanel',
[..]
> +
> +Ext.define('PVE.sdn.Fabric.Ospf.Node.Edit', {
Overall, seems this component is mostly the same as the respective
OpenFabric counterpart - maybe a common parent ExtJS component can be
created?
[..]
> +
> + initComponent: function() {
> + let me = this;
> +
> + me.node_not_accessible_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
> + userCls: 'pmx-hint',
> + value: gettext('The node is not accessible.'),
> + hidden: true,
> + });
> +
> +
> + let ipanel = Ext.create('PVE.sdn.Fabric.Ospf.Node.InputPanel', {
> + interface_selector: me.interface_selector,
> + node_not_accessible_warning: me.node_not_accessible_warning,
> + isCreate: me.isCreate,
> + loadClusterInterfaces: me.loadClusterInterfaces,
> + });
> +
> + Ext.apply(me, {
> + subject: gettext('Node'),
> + items: [ipanel],
> + });
> +
> + me.callParent();
> +
> + if (!me.isCreate) {
> + me.loadAllAvailableNodes((allNodes) => {
> + if (allNodes.some(i => i.name === me.node)) {
> + me.loadClusterInterfaces(me.node, (clusterResult) => {
> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
> + fabricResult.interface = fabricResult.interface
> + .map(i => PVE.Parser.parsePropertyString(i));
> +
> + let data = {
> + node: fabricResult,
> + network_interfaces: clusterResult,
> + };
> +
> + ipanel.setValues(data);
> + });
> + });
> + } else {
> + me.node_not_accessible_warning.setHidden(false);
> + // If the node is not currently in the cluster and not available (we can't get it's interfaces).
> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
nit: wrong indentation :^)
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components
2025-04-03 9:16 ` Christoph Heiss
@ 2025-04-04 15:45 ` Gabriel Goller
0 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-04-04 15:45 UTC (permalink / raw)
To: Christoph Heiss; +Cc: Proxmox VE development discussion
On 03.04.2025 11:16, Christoph Heiss wrote:
>On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
>[..]
>> diff --git a/www/manager6/sdn/fabrics/openfabric/NodeEdit.js b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js
>> new file mode 100644
>> index 000000000000..f2d204c22542
>> --- /dev/null
>> +++ b/www/manager6/sdn/fabrics/openfabric/NodeEdit.js
>> @@ -0,0 +1,205 @@
>> +Ext.define('PVE.sdn.Fabric.OpenFabric.Node.InputPanel', {
>> + extend: 'Proxmox.panel.InputPanel',
>> +
>> + viewModel: {},
>> +
>> + isCreate: undefined,
>> + loadClusterInterfaces: undefined,
>> +
>> + interface_selector: undefined,
>> + node_not_accessible_warning: undefined,
>
>All new variables should be camelCase [0] here too, as noted in a later
>patch.
>
>[0] https://pve.proxmox.com/wiki/Javascript_Style_Guide#Casing
Done, I hope I didn't miss anything.
>> +
>[..]
>> + initComponent: function() {
>> + let me = this;
>> + me.interface_selector = Ext.create('PVE.sdn.Fabric.OpenFabric.InterfacePanel', {
>> + name: 'interfaces',
>> + parentClass: me.isCreate ? me : undefined,
>> + });
>> + me.items = [
>> + {
>> + xtype: 'pveNodeSelector',
>> + reference: 'nodeselector',
>> + fieldLabel: gettext('Node'),
>> + labelWidth: 120,
>> + name: 'node',
>> + allowBlank: false,
>> + disabled: !me.isCreate,
>> + onlineValidator: me.isCreate,
>> + autoSelect: me.isCreate,
>> + listeners: {
>> + change: function(f, value) {
>> + if (me.isCreate) {
>> + me.loadClusterInterfaces(value, (result) => {
>> + me.setValues({ network_interfaces: result });
>> + });
>> + }
>> + },
>> + },
>> + listConfig: {
>> + columns: [
>> + {
>> + header: gettext('Node'),
>> + dataIndex: 'node',
>> + sortable: true,
>> + hideable: false,
>> + flex: 1,
>> + },
>> + ],
>> + },
>
>For the node selector, it would be great if existing nodes could be
>excluded from the dropdown. It isn't possible anyway and throws an error
>on submit, so excluding them here would be good UX.
>
>The `allowedNodes` and/or `disallowedNodes` properties on the
>selector can be used for this.
Yep, implemented this.
>
>> +
>> + },
>> + me.node_not_accessible_warning,
>> + {
>> + xtype: 'textfield',
>> + fieldLabel: gettext('Loopback IP'),
>> + labelWidth: 120,
>> + name: 'router_id',
>> + allowBlank: false,
>> + },
>
>Here, the user-visible name is 'Loopback IP', internally it is named
>'Router ID'. In the documentation, 'Router-ID' is used too in the
>associated documentation.
>
>Perhaps just settle on Router-ID? As long as it is explained in the
>documentation (maybe also add a tooltip?), I wouldn't use a separate
>name IMHO.
We chose 'Loopback IP' as the user-facing term. Internally it's still
router-id.
>
>> + me.interface_selector,
>> + ];
>> + me.callParent();
>> + },
>> +});
>> +
>> +Ext.define('PVE.sdn.Fabric.OpenFabric.Node.Edit', {
>> + extend: 'Proxmox.window.Edit',
>> + xtype: 'pveSDNFabricAddNode',
>[..]
>> +
>> + initComponent: function() {
>> + let me = this;
>> +
>> + me.node_not_accessible_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
>> + userCls: 'pmx-hint',
>> + value: gettext('The node is not accessible.'),
>> + hidden: true,
>> + });
>> +
>> + let ipanel = Ext.create('PVE.sdn.Fabric.OpenFabric.Node.InputPanel', {
>> + node_not_accessible_warning: me.node_not_accessible_warning,
>> + isCreate: me.isCreate,
>> + loadClusterInterfaces: me.loadClusterInterfaces,
>> + });
>> +
>> + Ext.apply(me, {
>> + subject: gettext('Node'),
>
>Can be moved to a direct member assignment outside of initComponent().
Done.
>> + items: [ipanel],
>> + });
>> +
>> + me.callParent();
>> +
>> + if (!me.isCreate) {
>> + me.loadAllAvailableNodes((allNodes) => {
>> + if (allNodes.some(i => i.name === me.node)) {
>> + me.loadClusterInterfaces(me.node, (clusterResult) => {
>> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
>> + fabricResult.interface = fabricResult.interface
>> + .map(i => PVE.Parser.parsePropertyString(i));
>> +
>> + let data = {
>> + node: fabricResult,
>> + network_interfaces: clusterResult,
>> + };
>> +
>> + ipanel.setValues(data);
>> + });
>> + });
>
>nit: perhaps move some of this into functions? This is pretty deeply
>nested at this point. Would make it definitely more readable.
Hmm debatable I guess—I find this quite ok readable, you get a sense of
what gets done after what.
Even if we split this up in function, the control flow will be harder to
see IMO.
>> + } else {
>> + me.node_not_accessible_warning.setHidden(false);
>> + // If the node is not currently in the cluster and not available (we can't get it's interfaces).
>> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
>> + fabricResult.interface = fabricResult.interface
>> + .map(i => PVE.Parser.parsePropertyString(i));
>> +
>> + let data = {
>> + node: fabricResult,
>> + };
>> +
>> + ipanel.setValues(data);
>> + });
>> + }
>> + });
>
>Seems oddly similar to the above, could this be simplified/abstracted a
>bit over both? If its feasible, of course.
I think that will make it more complicated, this clearly separates the
"connected" and the "unconnected" node.
>> + }
>> +
>> + if (me.isCreate) {
>> + me.method = 'POST';
>> + } else {
>> + me.method = 'PUT';
>> + }
>> + },
>> +});
>> +
>> diff --git a/www/manager6/sdn/fabrics/ospf/NodeEdit.js b/www/manager6/sdn/fabrics/ospf/NodeEdit.js
>> new file mode 100644
>> index 000000000000..d022272b5428
>> --- /dev/null
>> +++ b/www/manager6/sdn/fabrics/ospf/NodeEdit.js
>> @@ -0,0 +1,207 @@
>> +Ext.define('PVE.sdn.Fabric.Ospf.Node.InputPanel', {
>> + extend: 'Proxmox.panel.InputPanel',
>[..]
>> +
>> +Ext.define('PVE.sdn.Fabric.Ospf.Node.Edit', {
>
>Overall, seems this component is mostly the same as the respective
>OpenFabric counterpart - maybe a common parent ExtJS component can be
>created?
Yep, factored out the NodeEdit and FabricEdit for OpenFabric and OSPF so
we have to common components.
>[..]
>> +
>> + initComponent: function() {
>> + let me = this;
>> +
>> + me.node_not_accessible_warning = Ext.create('Proxmox.form.field.DisplayEdit', {
>> + userCls: 'pmx-hint',
>> + value: gettext('The node is not accessible.'),
>> + hidden: true,
>> + });
>> +
>> +
>> + let ipanel = Ext.create('PVE.sdn.Fabric.Ospf.Node.InputPanel', {
>> + interface_selector: me.interface_selector,
>> + node_not_accessible_warning: me.node_not_accessible_warning,
>> + isCreate: me.isCreate,
>> + loadClusterInterfaces: me.loadClusterInterfaces,
>> + });
>> +
>> + Ext.apply(me, {
>> + subject: gettext('Node'),
>> + items: [ipanel],
>> + });
>> +
>> + me.callParent();
>> +
>> + if (!me.isCreate) {
>> + me.loadAllAvailableNodes((allNodes) => {
>> + if (allNodes.some(i => i.name === me.node)) {
>> + me.loadClusterInterfaces(me.node, (clusterResult) => {
>> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
>> + fabricResult.interface = fabricResult.interface
>> + .map(i => PVE.Parser.parsePropertyString(i));
>> +
>> + let data = {
>> + node: fabricResult,
>> + network_interfaces: clusterResult,
>> + };
>> +
>> + ipanel.setValues(data);
>> + });
>> + });
>> + } else {
>> + me.node_not_accessible_warning.setHidden(false);
>> + // If the node is not currently in the cluster and not available (we can't get it's interfaces).
>> + me.loadFabricInterfaces(me.fabric, me.node, (fabricResult) => {
>
>nit: wrong indentation :^)
Fixed :)
Thanks for the review!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (48 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-04-02 9:26 ` Friedrich Weber
2025-04-02 9:50 ` Christoph Heiss
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 7/7] utils: avoid line-break in pending changes message Gabriel Goller
` (3 subsequent siblings)
53 siblings, 2 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
TreeView that shows all the fabrics and nodes in a hierarchical
structure. It also shows all the pending changes from the
running-config.
We decided against including all the interfaces (as children of nodes)
because otherwise the indentation would be too much. So to keep it
simple, we removed the interface entries and also moved the protocol to
the column (instead of having two root nodes for each protocol).
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/dc/Config.js | 8 +
www/manager6/sdn/FabricsView.js | 430 ++++++++++++++++++++++++++++++++
3 files changed, 439 insertions(+)
create mode 100644 www/manager6/sdn/FabricsView.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 7ed2839d9557..224b6079e833 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -303,6 +303,7 @@ JSSRC= \
sdn/zones/SimpleEdit.js \
sdn/zones/VlanEdit.js \
sdn/zones/VxlanEdit.js \
+ sdn/FabricsView.js \
sdn/fabrics/Common.js \
sdn/fabrics/openfabric/FabricEdit.js \
sdn/fabrics/openfabric/NodeEdit.js \
diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
index 74728c8320e9..68f7be8d6042 100644
--- a/www/manager6/dc/Config.js
+++ b/www/manager6/dc/Config.js
@@ -229,6 +229,14 @@ Ext.define('PVE.dc.Config', {
hidden: true,
iconCls: 'fa fa-shield',
itemId: 'sdnfirewall',
+ },
+ {
+ xtype: 'pveSDNFabricView',
+ groups: ['sdn'],
+ title: gettext('Fabrics'),
+ hidden: true,
+ iconCls: 'fa fa-road',
+ itemId: 'sdnfabrics',
});
}
diff --git a/www/manager6/sdn/FabricsView.js b/www/manager6/sdn/FabricsView.js
new file mode 100644
index 000000000000..0ef12defb1a8
--- /dev/null
+++ b/www/manager6/sdn/FabricsView.js
@@ -0,0 +1,430 @@
+const FABRIC_PANELS = {
+ 'openfabric': 'PVE.sdn.Fabric.OpenFabric.Fabric.Edit',
+ 'ospf': 'PVE.sdn.Fabric.Ospf.Fabric.Edit',
+};
+
+const NODE_PANELS = {
+ 'openfabric': 'PVE.sdn.Fabric.OpenFabric.Node.Edit',
+ 'ospf': 'PVE.sdn.Fabric.Ospf.Node.Edit',
+};
+
+Ext.define('PVE.sdn.Fabric.View', {
+ extend: 'Ext.tree.Panel',
+
+ xtype: 'pveSDNFabricView',
+ mixins: ['Proxmox.Mixin.CBind'],
+
+ onlineHelp: 'pvesdn_config_fabrics',
+
+ columns: [
+ {
+ xtype: 'treecolumn',
+ text: gettext('Name'),
+ dataIndex: 'name',
+ width: 200,
+ renderer: function(value, metaData, rec) {
+ return PVE.Utils.render_sdn_pending(rec, value, 'name');
+ },
+ },
+ {
+ text: gettext('Protocol'),
+ dataIndex: 'protocol',
+ width: 100,
+ renderer: function(value, metaData, rec) {
+ if (rec.data.type !== 'fabric') {
+ return "";
+ }
+
+ return PVE.Utils.render_sdn_pending(rec, value, 'protocol');
+ },
+ },
+ {
+ text: gettext('Loopback IP'),
+ dataIndex: 'router_id',
+ width: 150,
+ renderer: function(value, metaData, rec) {
+ if (rec.data.type === 'fabric') {
+ return PVE.Utils.render_sdn_pending(rec, rec.data.loopback_prefix, 'loopback_prefix');
+ }
+
+ return PVE.Utils.render_sdn_pending(rec, value, 'router_id');
+ },
+ },
+ {
+ text: gettext('Action'),
+ xtype: 'actioncolumn',
+ dataIndex: 'text',
+ width: 100,
+ items: [
+ {
+ handler: 'addActionTreeColumn',
+ getTip: (_v, _m, _rec) => gettext('Add'),
+ getClass: (_v, _m, { data }) => {
+ if (data.type === 'fabric') {
+ return 'fa fa-plus-circle';
+ }
+
+ return 'pmx-hidden';
+ },
+ isActionDisabled: (_v, _r, _c, _i, { data }) => data.type !== 'fabric',
+ },
+ {
+ tooltip: gettext('Edit'),
+ handler: 'editAction',
+ getClass: (_v, _m, { data }) => {
+ // the fabric type (openfabric, ospf, etc.) cannot be edited
+ if (data.type) {
+ return 'fa fa-pencil fa-fw';
+ }
+
+ return 'pmx-hidden';
+ },
+ isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
+ },
+ {
+ tooltip: gettext('Delete'),
+ handler: 'deleteAction',
+ getClass: (_v, _m, { data }) => {
+ // the fabric type (openfabric, ospf, etc.) cannot be deleted
+ if (data.type) {
+ return 'fa critical fa-trash-o';
+ }
+
+ return 'pmx-hidden';
+ },
+ isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
+ },
+ ],
+ },
+ {
+ header: gettext('Interfaces'),
+ width: 100,
+ dataIndex: 'interface',
+ renderer: function(value, metaData, rec) {
+ let interfaces = rec.data.pending?.interface || rec.data.interface || [];
+
+ let names = interfaces.map((iface) => {
+ let properties = Proxmox.Utils.parsePropertyString(iface);
+ return properties.name;
+ });
+
+ names.sort();
+ return names.join(", ");
+ },
+ },
+ {
+ header: gettext('State'),
+ width: 100,
+ dataIndex: 'state',
+ renderer: function(value, metaData, rec) {
+ return PVE.Utils.render_sdn_pending_state(rec, value);
+ },
+ },
+ ],
+
+ store: {
+ sorters: ['name'],
+ },
+
+ layout: 'fit',
+ rootVisible: false,
+ animate: false,
+
+
+ initComponent: function() {
+ let me = this;
+
+
+ let add_button = new Proxmox.button.Button({
+ text: gettext('Add Node'),
+ handler: 'addActionTbar',
+ disabled: true,
+ });
+
+ let set_add_button_status = function() {
+ let selection = me.view.getSelection();
+
+ if (selection.length === 0) {
+ return;
+ }
+
+ add_button.setDisabled(selection[0].data.type !== 'fabric');
+ };
+
+ Ext.apply(me, {
+ tbar: [
+ {
+ text: gettext('Add Fabric'),
+ menu: [
+ {
+ text: gettext('OpenFabric'),
+ handler: 'openAddOpenFabricWindow',
+ },
+ {
+ text: gettext('OSPF'),
+ handler: 'openAddOspfWindow',
+ },
+ ],
+ },
+ add_button,
+ {
+ xtype: 'proxmoxButton',
+ text: gettext('Reload'),
+ handler: 'reload',
+ },
+ ],
+ listeners: {
+ selectionchange: set_add_button_status,
+ },
+ });
+
+ me.callParent();
+ },
+
+ controller: {
+ xclass: 'Ext.app.ViewController',
+
+ reload: function() {
+ let me = this;
+
+ Proxmox.Utils.API2Request({
+ url: `/cluster/sdn/fabrics/?pending=1`,
+ method: 'GET',
+ success: function(response, opts) {
+ let ospf = response.result.data.ospf;
+ let openfabric = response.result.data.openfabric;
+
+ // add some metadata so we can merge the objects later and still know the protocol/type
+ ospf = ospf.map(x => {
+ if (x.state && x.state === 'new') {
+ Object.assign(x, x.pending);
+ }
+
+ if (x.ty === 'fabric') {
+ return Object.assign(x, { protocol: "ospf", name: x.area });
+ } else if (x.ty === 'node') {
+ let id = x.node_id.split("_");
+ return Object.assign(x,
+ {
+ protocol: "ospf",
+ node: id[1],
+ fabric: id[0],
+ },
+ );
+ } else {
+ return x;
+ }
+ });
+ openfabric = openfabric.map(x => {
+ if (x.state && x.state === 'new') {
+ Object.assign(x, x.pending);
+ }
+
+ if (x.ty === 'fabric') {
+ return Object.assign(x, { protocol: "openfabric", name: x.fabric_id });
+ } else if (x.ty === 'node') {
+ let id = x.node_id.split("_");
+ return Object.assign(x,
+ {
+ protocol: "openfabric",
+ node: id[1],
+ fabric: id[0],
+ },
+ );
+ } else {
+ return x;
+ }
+ });
+
+ let allFabrics = openfabric.concat(ospf);
+ let fabrics = allFabrics.filter(e => e.ty === "fabric").map((fabric) => {
+ if (!fabric.state || fabric.state !== 'deleted') {
+ fabric.children = allFabrics.filter(e => e.ty === "node")
+ .filter((node) =>
+ node.fabric === fabric.name && node.protocol === fabric.protocol)
+ .map((node) => {
+ Object.assign(node, {
+ leaf: true,
+ type: 'node',
+ iconCls: 'fa fa-desktop x-fa-treepanel',
+ name: node.node,
+ _fabric: fabric.name,
+ });
+
+ return node;
+ });
+ }
+
+ Object.assign(fabric, {
+ type: 'fabric',
+ protocol: fabric.protocol,
+ expanded: true,
+ name: fabric.fabric_id || fabric.area,
+ iconCls: 'fa fa-road x-fa-treepanel',
+ });
+
+ return fabric;
+ });
+
+ me.getView().setRootNode({
+ name: '__root',
+ expanded: true,
+ children: fabrics,
+ });
+ },
+ });
+ },
+
+ getFabricEditPanel: function(type) {
+ return FABRIC_PANELS[type];
+ },
+
+ getNodeEditPanel: function(type) {
+ return NODE_PANELS[type];
+ },
+
+ addActionTreeColumn: function(_grid, _rI, _cI, _item, _e, rec) {
+ let me = this;
+ this.addAction(rec);
+ },
+
+ addActionTbar: function() {
+ let me = this;
+
+ let selection = me.view.getSelection();
+
+ if (selection.length === 0) {
+ return;
+ }
+
+ if (selection[0].data.type === 'fabric') {
+ me.addAction(selection[0]);
+ }
+ },
+
+ addAction: function(rec) {
+ let me = this;
+
+ let component = me.getNodeEditPanel(rec.data.protocol);
+
+ if (!component) {
+ console.warn(`unknown protocol ${rec.data.protocol}`);
+ return;
+ }
+
+ let extraRequestParams = {
+ fabric: rec.data.name,
+ };
+
+ let window = Ext.create(component, {
+ autoShow: true,
+ isCreate: true,
+ autoLoad: false,
+ extraRequestParams,
+ });
+
+ window.on('destroy', () => me.reload());
+ },
+
+ editAction: function(_grid, _rI, _cI, _item, _e, rec) {
+ let me = this;
+
+ let component = '';
+ let url = '';
+ let autoLoad = true;
+
+ if (rec.data.type === 'fabric') {
+ component = me.getFabricEditPanel(rec.data.protocol);
+ url = `/cluster/sdn/fabrics/${rec.data.protocol}/${rec.data.name}`;
+ } else if (rec.data.type === 'node') {
+ component = me.getNodeEditPanel(rec.data.protocol);
+ // no url, every request is done manually
+ url = `/cluster/sdn/fabrics/${rec.data.protocol}/${rec.data._fabric}/node/${rec.data.node}`;
+ autoLoad = false;
+ }
+
+ if (!component) {
+ console.warn(`unknown protocol ${rec.data.protocol} or unknown type ${rec.data.type}`);
+ return;
+ }
+
+ let window = Ext.create(component, {
+ autoShow: true,
+ autoLoad: autoLoad,
+ isCreate: false,
+ submitUrl: url,
+ loadUrl: url,
+ fabric: rec.data._fabric,
+ node: rec.data.node,
+ });
+
+ window.on('destroy', () => me.reload());
+ },
+
+ deleteAction: function(table, rI, cI, item, e, { data }) {
+ let me = this;
+ let view = me.getView();
+
+ Ext.Msg.show({
+ title: gettext('Confirm'),
+ icon: Ext.Msg.WARNING,
+ message: Ext.String.format(gettext('Are you sure you want to remove the fabric {0}?'), `${data.name}`),
+ buttons: Ext.Msg.YESNO,
+ defaultFocus: 'no',
+ callback: function(btn) {
+ if (btn !== 'yes') {
+ return;
+ }
+
+ let url;
+ if (data.type === "node") {
+ url = `/cluster/sdn/fabrics/${data.protocol}/${data._fabric}/node/${data.name}`;
+ } else if (data.type === "fabric") {
+ url = `/cluster/sdn/fabrics/${data.protocol}/${data.name}`;
+ } else {
+ console.warn("deleteAction: missing type");
+ }
+
+ Proxmox.Utils.API2Request({
+ url,
+ method: 'DELETE',
+ waitMsgTarget: view,
+ failure: function(response, opts) {
+ Ext.Msg.alert(gettext('Error'), response.htmlStatus);
+ },
+ callback: me.reload.bind(me),
+ });
+ },
+ });
+ },
+
+ openAddOpenFabricWindow: function() {
+ let me = this;
+
+ let window = Ext.create('PVE.sdn.Fabric.OpenFabric.Fabric.Edit', {
+ autoShow: true,
+ autoLoad: false,
+ isCreate: true,
+ });
+
+ window.on('destroy', () => me.reload());
+ },
+
+ openAddOspfWindow: function() {
+ let me = this;
+
+ let window = Ext.create('PVE.sdn.Fabric.Ospf.Fabric.Edit', {
+ autoShow: true,
+ autoLoad: false,
+ isCreate: true,
+ });
+
+ window.on('destroy', () => me.reload());
+ },
+
+ init: function(view) {
+ let me = this;
+ me.reload();
+ },
+ },
+});
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView Gabriel Goller
@ 2025-04-02 9:26 ` Friedrich Weber
2025-04-02 9:50 ` Christoph Heiss
1 sibling, 0 replies; 97+ messages in thread
From: Friedrich Weber @ 2025-04-02 9:26 UTC (permalink / raw)
To: pve-devel
Hi, two comments inline:
On 28/03/2025 18:13, Gabriel Goller wrote:
> TreeView that shows all the fabrics and nodes in a hierarchical
> structure. It also shows all the pending changes from the
> running-config.
>
> We decided against including all the interfaces (as children of nodes)
> because otherwise the indentation would be too much. So to keep it
> simple, we removed the interface entries and also moved the protocol to
> the column (instead of having two root nodes for each protocol).
>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
> ---
> www/manager6/Makefile | 1 +
> www/manager6/dc/Config.js | 8 +
> www/manager6/sdn/FabricsView.js | 430 ++++++++++++++++++++++++++++++++
> 3 files changed, 439 insertions(+)
> create mode 100644 www/manager6/sdn/FabricsView.js
>
> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
> index 7ed2839d9557..224b6079e833 100644
> --- a/www/manager6/Makefile
> +++ b/www/manager6/Makefile
> @@ -303,6 +303,7 @@ JSSRC= \
> sdn/zones/SimpleEdit.js \
> sdn/zones/VlanEdit.js \
> sdn/zones/VxlanEdit.js \
> + sdn/FabricsView.js \
> sdn/fabrics/Common.js \
> sdn/fabrics/openfabric/FabricEdit.js \
> sdn/fabrics/openfabric/NodeEdit.js \
> diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
> index 74728c8320e9..68f7be8d6042 100644
> --- a/www/manager6/dc/Config.js
> +++ b/www/manager6/dc/Config.js
> @@ -229,6 +229,14 @@ Ext.define('PVE.dc.Config', {
> hidden: true,
> iconCls: 'fa fa-shield',
> itemId: 'sdnfirewall',
> + },
> + {
> + xtype: 'pveSDNFabricView',
> + groups: ['sdn'],
> + title: gettext('Fabrics'),
> + hidden: true,
> + iconCls: 'fa fa-road',
> + itemId: 'sdnfabrics',
> });
> }
>
> diff --git a/www/manager6/sdn/FabricsView.js b/www/manager6/sdn/FabricsView.js
> new file mode 100644
> index 000000000000..0ef12defb1a8
> --- /dev/null
> +++ b/www/manager6/sdn/FabricsView.js
> @@ -0,0 +1,430 @@
> +const FABRIC_PANELS = {
> + 'openfabric': 'PVE.sdn.Fabric.OpenFabric.Fabric.Edit',
> + 'ospf': 'PVE.sdn.Fabric.Ospf.Fabric.Edit',
> +};
> +
> +const NODE_PANELS = {
> + 'openfabric': 'PVE.sdn.Fabric.OpenFabric.Node.Edit',
> + 'ospf': 'PVE.sdn.Fabric.Ospf.Node.Edit',
> +};
> +
> +Ext.define('PVE.sdn.Fabric.View', {
> + extend: 'Ext.tree.Panel',
> +
> + xtype: 'pveSDNFabricView',
> + mixins: ['Proxmox.Mixin.CBind'],
> +
> + onlineHelp: 'pvesdn_config_fabrics',
> +
> + columns: [
> + {
> + xtype: 'treecolumn',
> + text: gettext('Name'),
> + dataIndex: 'name',
> + width: 200,
> + renderer: function(value, metaData, rec) {
> + return PVE.Utils.render_sdn_pending(rec, value, 'name');
> + },
> + },
> + {
> + text: gettext('Protocol'),
> + dataIndex: 'protocol',
> + width: 100,
> + renderer: function(value, metaData, rec) {
> + if (rec.data.type !== 'fabric') {
> + return "";
> + }
> +
> + return PVE.Utils.render_sdn_pending(rec, value, 'protocol');
> + },
> + },
> + {
> + text: gettext('Loopback IP'),
> + dataIndex: 'router_id',
> + width: 150,
> + renderer: function(value, metaData, rec) {
> + if (rec.data.type === 'fabric') {
> + return PVE.Utils.render_sdn_pending(rec, rec.data.loopback_prefix, 'loopback_prefix');
> + }
> +
> + return PVE.Utils.render_sdn_pending(rec, value, 'router_id');
> + },
> + },
> + {
> + text: gettext('Action'),
> + xtype: 'actioncolumn',
> + dataIndex: 'text',
> + width: 100,
> + items: [
> + {
> + handler: 'addActionTreeColumn',
> + getTip: (_v, _m, _rec) => gettext('Add'),
> + getClass: (_v, _m, { data }) => {
> + if (data.type === 'fabric') {
> + return 'fa fa-plus-circle';
> + }
> +
> + return 'pmx-hidden';
> + },
> + isActionDisabled: (_v, _r, _c, _i, { data }) => data.type !== 'fabric',
> + },
> + {
> + tooltip: gettext('Edit'),
> + handler: 'editAction',
> + getClass: (_v, _m, { data }) => {
> + // the fabric type (openfabric, ospf, etc.) cannot be edited
> + if (data.type) {
> + return 'fa fa-pencil fa-fw';
> + }
> +
> + return 'pmx-hidden';
> + },
> + isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
> + },
> + {
> + tooltip: gettext('Delete'),
> + handler: 'deleteAction',
> + getClass: (_v, _m, { data }) => {
> + // the fabric type (openfabric, ospf, etc.) cannot be deleted
> + if (data.type) {
> + return 'fa critical fa-trash-o';
> + }
> +
> + return 'pmx-hidden';
> + },
> + isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
> + },
> + ],
> + },
> + {
> + header: gettext('Interfaces'),
> + width: 100,
> + dataIndex: 'interface',
> + renderer: function(value, metaData, rec) {
> + let interfaces = rec.data.pending?.interface || rec.data.interface || [];
> +
> + let names = interfaces.map((iface) => {
> + let properties = Proxmox.Utils.parsePropertyString(iface);
> + return properties.name;
> + });
> +
> + names.sort();
> + return names.join(", ");
Wouldn't hurt to htmlEncode here, to be on the safe side.
> + },
> + },
> + {
> + header: gettext('State'),
> + width: 100,
> + dataIndex: 'state',
> + renderer: function(value, metaData, rec) {
> + return PVE.Utils.render_sdn_pending_state(rec, value);
> + },
> + },
> + ],
> +
> + store: {
> + sorters: ['name'],
> + },
> +
> + layout: 'fit',
> + rootVisible: false,
> + animate: false,
> +
> +
> + initComponent: function() {
> + let me = this;
> +
> +
> + let add_button = new Proxmox.button.Button({
> + text: gettext('Add Node'),
> + handler: 'addActionTbar',
> + disabled: true,
> + });
> +
> + let set_add_button_status = function() {
> + let selection = me.view.getSelection();
> +
> + if (selection.length === 0) {
> + return;
> + }
> +
> + add_button.setDisabled(selection[0].data.type !== 'fabric');
> + };
> +
> + Ext.apply(me, {
> + tbar: [
> + {
> + text: gettext('Add Fabric'),
> + menu: [
> + {
> + text: gettext('OpenFabric'),
> + handler: 'openAddOpenFabricWindow',
> + },
> + {
> + text: gettext('OSPF'),
> + handler: 'openAddOspfWindow',
> + },
> + ],
> + },
> + add_button,
> + {
> + xtype: 'proxmoxButton',
> + text: gettext('Reload'),
> + handler: 'reload',
> + },
> + ],
> + listeners: {
> + selectionchange: set_add_button_status,
> + },
> + });
> +
> + me.callParent();
> + },
> +
> + controller: {
> + xclass: 'Ext.app.ViewController',
> +
> + reload: function() {
> + let me = this;
> +
> + Proxmox.Utils.API2Request({
> + url: `/cluster/sdn/fabrics/?pending=1`,
> + method: 'GET',
> + success: function(response, opts) {
> + let ospf = response.result.data.ospf;
> + let openfabric = response.result.data.openfabric;
> +
> + // add some metadata so we can merge the objects later and still know the protocol/type
> + ospf = ospf.map(x => {
> + if (x.state && x.state === 'new') {
> + Object.assign(x, x.pending);
> + }
> +
> + if (x.ty === 'fabric') {
> + return Object.assign(x, { protocol: "ospf", name: x.area });
> + } else if (x.ty === 'node') {
> + let id = x.node_id.split("_");
> + return Object.assign(x,
> + {
> + protocol: "ospf",
> + node: id[1],
> + fabric: id[0],
> + },
> + );
> + } else {
> + return x;
> + }
> + });
> + openfabric = openfabric.map(x => {
> + if (x.state && x.state === 'new') {
> + Object.assign(x, x.pending);
> + }
> +
> + if (x.ty === 'fabric') {
> + return Object.assign(x, { protocol: "openfabric", name: x.fabric_id });
> + } else if (x.ty === 'node') {
> + let id = x.node_id.split("_");
> + return Object.assign(x,
> + {
> + protocol: "openfabric",
> + node: id[1],
> + fabric: id[0],
> + },
> + );
> + } else {
> + return x;
> + }
> + });
> +
> + let allFabrics = openfabric.concat(ospf);
> + let fabrics = allFabrics.filter(e => e.ty === "fabric").map((fabric) => {
> + if (!fabric.state || fabric.state !== 'deleted') {
> + fabric.children = allFabrics.filter(e => e.ty === "node")
> + .filter((node) =>
> + node.fabric === fabric.name && node.protocol === fabric.protocol)
> + .map((node) => {
> + Object.assign(node, {
> + leaf: true,
> + type: 'node',
> + iconCls: 'fa fa-desktop x-fa-treepanel',
> + name: node.node,
> + _fabric: fabric.name,
> + });
> +
> + return node;
> + });
> + }
> +
> + Object.assign(fabric, {
> + type: 'fabric',
> + protocol: fabric.protocol,
> + expanded: true,
> + name: fabric.fabric_id || fabric.area,
> + iconCls: 'fa fa-road x-fa-treepanel',
> + });
> +
> + return fabric;
> + });
> +
> + me.getView().setRootNode({
> + name: '__root',
> + expanded: true,
> + children: fabrics,
> + });
> + },
> + });
> + },
> +
> + getFabricEditPanel: function(type) {
> + return FABRIC_PANELS[type];
> + },
> +
> + getNodeEditPanel: function(type) {
> + return NODE_PANELS[type];
> + },
> +
> + addActionTreeColumn: function(_grid, _rI, _cI, _item, _e, rec) {
> + let me = this;
> + this.addAction(rec);
> + },
> +
> + addActionTbar: function() {
> + let me = this;
> +
> + let selection = me.view.getSelection();
> +
> + if (selection.length === 0) {
> + return;
> + }
> +
> + if (selection[0].data.type === 'fabric') {
> + me.addAction(selection[0]);
> + }
> + },
> +
> + addAction: function(rec) {
> + let me = this;
> +
> + let component = me.getNodeEditPanel(rec.data.protocol);
> +
> + if (!component) {
> + console.warn(`unknown protocol ${rec.data.protocol}`);
> + return;
> + }
> +
> + let extraRequestParams = {
> + fabric: rec.data.name,
> + };
> +
> + let window = Ext.create(component, {
> + autoShow: true,
> + isCreate: true,
> + autoLoad: false,
> + extraRequestParams,
> + });
> +
> + window.on('destroy', () => me.reload());
> + },
> +
> + editAction: function(_grid, _rI, _cI, _item, _e, rec) {
> + let me = this;
> +
> + let component = '';
> + let url = '';
> + let autoLoad = true;
> +
> + if (rec.data.type === 'fabric') {
> + component = me.getFabricEditPanel(rec.data.protocol);
> + url = `/cluster/sdn/fabrics/${rec.data.protocol}/${rec.data.name}`;
> + } else if (rec.data.type === 'node') {
> + component = me.getNodeEditPanel(rec.data.protocol);
> + // no url, every request is done manually
> + url = `/cluster/sdn/fabrics/${rec.data.protocol}/${rec.data._fabric}/node/${rec.data.node}`;
> + autoLoad = false;
> + }
> +
> + if (!component) {
> + console.warn(`unknown protocol ${rec.data.protocol} or unknown type ${rec.data.type}`);
> + return;
> + }
> +
> + let window = Ext.create(component, {
> + autoShow: true,
> + autoLoad: autoLoad,
> + isCreate: false,
> + submitUrl: url,
> + loadUrl: url,
> + fabric: rec.data._fabric,
> + node: rec.data.node,
> + });
> +
> + window.on('destroy', () => me.reload());
> + },
> +
> + deleteAction: function(table, rI, cI, item, e, { data }) {
> + let me = this;
> + let view = me.getView();
> +
> + Ext.Msg.show({
> + title: gettext('Confirm'),
> + icon: Ext.Msg.WARNING,
> + message: Ext.String.format(gettext('Are you sure you want to remove the fabric {0}?'), `${data.name}`),
This is missing an htmlEncode.
> + buttons: Ext.Msg.YESNO,
> + defaultFocus: 'no',
> + callback: function(btn) {
> + if (btn !== 'yes') {
> + return;
> + }
> +
> + let url;
> + if (data.type === "node") {
> + url = `/cluster/sdn/fabrics/${data.protocol}/${data._fabric}/node/${data.name}`;
> + } else if (data.type === "fabric") {
> + url = `/cluster/sdn/fabrics/${data.protocol}/${data.name}`;
> + } else {
> + console.warn("deleteAction: missing type");
> + }
> +
> + Proxmox.Utils.API2Request({
> + url,
> + method: 'DELETE',
> + waitMsgTarget: view,
> + failure: function(response, opts) {
> + Ext.Msg.alert(gettext('Error'), response.htmlStatus);
> + },
> + callback: me.reload.bind(me),
> + });
> + },
> + });
> + },
> +
> + openAddOpenFabricWindow: function() {
> + let me = this;
> +
> + let window = Ext.create('PVE.sdn.Fabric.OpenFabric.Fabric.Edit', {
> + autoShow: true,
> + autoLoad: false,
> + isCreate: true,
> + });
> +
> + window.on('destroy', () => me.reload());
> + },
> +
> + openAddOspfWindow: function() {
> + let me = this;
> +
> + let window = Ext.create('PVE.sdn.Fabric.Ospf.Fabric.Edit', {
> + autoShow: true,
> + autoLoad: false,
> + isCreate: true,
> + });
> +
> + window.on('destroy', () => me.reload());
> + },
> +
> + init: function(view) {
> + let me = this;
> + me.reload();
> + },
> + },
> +});
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView Gabriel Goller
2025-04-02 9:26 ` Friedrich Weber
@ 2025-04-02 9:50 ` Christoph Heiss
2025-04-02 10:40 ` Gabriel Goller
1 sibling, 1 reply; 97+ messages in thread
From: Christoph Heiss @ 2025-04-02 9:50 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox VE development discussion
Some comments inline - did the review mostly in tandem with testing the
UI, to get a better context.
On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
[..]
> diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
> index 74728c8320e9..68f7be8d6042 100644
> --- a/www/manager6/dc/Config.js
> +++ b/www/manager6/dc/Config.js
> @@ -229,6 +229,14 @@ Ext.define('PVE.dc.Config', {
> hidden: true,
> iconCls: 'fa fa-shield',
> itemId: 'sdnfirewall',
> + },
> + {
> + xtype: 'pveSDNFabricView',
> + groups: ['sdn'],
> + title: gettext('Fabrics'),
Do we really want to translate 'Fabrics'? Or rather just keep the name
always at 'Fabrics' as the name of the concept/feature itself? Since it
is a established term, after all. I'd keep it, IMHO.
(But we seem to translate everything else here in the file, so really
not sure.)
> + hidden: true,
> + iconCls: 'fa fa-road',
> + itemId: 'sdnfabrics',
> });
> }
>
> diff --git a/www/manager6/sdn/FabricsView.js b/www/manager6/sdn/FabricsView.js
> new file mode 100644
> index 000000000000..0ef12defb1a8
> --- /dev/null
> +++ b/www/manager6/sdn/FabricsView.js
[..]
> +Ext.define('PVE.sdn.Fabric.View', {
[..]
> + {
> + text: gettext('Protocol'),
> + dataIndex: 'protocol',
> + width: 100,
> + renderer: function(value, metaData, rec) {
> + if (rec.data.type !== 'fabric') {
> + return "";
> + }
> +
> + return PVE.Utils.render_sdn_pending(rec, value, 'protocol');
> + },
A mapping for the internal protocol name to a user-visible would be nice
here, i.e. 'ospf' -> 'OSPF' and 'openfabric' -> 'OpenFabric'. Not much
difference currently, but would look a bit better in the UI :)
> + },
> + {
> + text: gettext('Loopback IP'),
> + dataIndex: 'router_id',
> + width: 150,
> + renderer: function(value, metaData, rec) {
> + if (rec.data.type === 'fabric') {
> + return PVE.Utils.render_sdn_pending(rec, rec.data.loopback_prefix, 'loopback_prefix');
> + }
> +
> + return PVE.Utils.render_sdn_pending(rec, value, 'router_id');
> + },
> + },
> + {
> + text: gettext('Action'),
> + xtype: 'actioncolumn',
> + dataIndex: 'text',
> + width: 100,
> + items: [
> + {
> + handler: 'addActionTreeColumn',
> + getTip: (_v, _m, _rec) => gettext('Add'),
nit: "Add Node" would be better here for node rows, if that's possible.
> + getClass: (_v, _m, { data }) => {
> + if (data.type === 'fabric') {
> + return 'fa fa-plus-circle';
> + }
> +
> + return 'pmx-hidden';
> + },
> + isActionDisabled: (_v, _r, _c, _i, { data }) => data.type !== 'fabric',
> + },
> + {
> + tooltip: gettext('Edit'),
^ same as above
> + handler: 'editAction',
> + getClass: (_v, _m, { data }) => {
> + // the fabric type (openfabric, ospf, etc.) cannot be edited
> + if (data.type) {
> + return 'fa fa-pencil fa-fw';
> + }
> +
> + return 'pmx-hidden';
> + },
> + isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
> + },
> + {
> + tooltip: gettext('Delete'),
^ and same here as well
> + handler: 'deleteAction',
> + getClass: (_v, _m, { data }) => {
> + // the fabric type (openfabric, ospf, etc.) cannot be deleted
> + if (data.type) {
> + return 'fa critical fa-trash-o';
> + }
> +
> + return 'pmx-hidden';
> + },
> + isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
> + },
> + ],
> + },
> + {
> + header: gettext('Interfaces'),
> + width: 100,
> + dataIndex: 'interface',
> + renderer: function(value, metaData, rec) {
> + let interfaces = rec.data.pending?.interface || rec.data.interface || [];
nit: could be const (see [0] tho regarding rules for const/let)
[0] https://pve.proxmox.com/wiki/Javascript_Style_Guide#Variables
> +
> + let names = interfaces.map((iface) => {
> + let properties = Proxmox.Utils.parsePropertyString(iface);
nit: same here, as well for some other things in this file
> + return properties.name;
> + });
> +
> + names.sort();
> + return names.join(", ");
> + },
> + },
[..]
> +
> + initComponent: function() {
> + let me = this;
> +
> +
> + let add_button = new Proxmox.button.Button({
New variables should generally be camelCase [0].
[1] https://pve.proxmox.com/wiki/Javascript_Style_Guide#Casing
> + text: gettext('Add Node'),
> + handler: 'addActionTbar',
> + disabled: true,
> + });
Since there is also an "add node" button in the "Action" column for each
fabric, do we need a separate one in the top-bar as well?
> +
> + let set_add_button_status = function() {
> + let selection = me.view.getSelection();
> +
> + if (selection.length === 0) {
> + return;
> + }
> +
> + add_button.setDisabled(selection[0].data.type !== 'fabric');
> + };
> +
> + Ext.apply(me, {
> + tbar: [
> + {
> + text: gettext('Add Fabric'),
> + menu: [
> + {
> + text: gettext('OpenFabric'),
'OpenFabric' also should not be translated, right? As its the name of
the implementation/protocol.
> + handler: 'openAddOpenFabricWindow',
> + },
> + {
> + text: gettext('OSPF'),
^ same here
> + handler: 'openAddOspfWindow',
> + },
> + ],
> + },
[..]
> + controller: {
> + xclass: 'Ext.app.ViewController',
> +
> + reload: function() {
> + let me = this;
> +
> + Proxmox.Utils.API2Request({
> + url: `/cluster/sdn/fabrics/?pending=1`,
> + method: 'GET',
> + success: function(response, opts) {
> + let ospf = response.result.data.ospf;
> + let openfabric = response.result.data.openfabric;
> +
> + // add some metadata so we can merge the objects later and still know the protocol/type
> + ospf = ospf.map(x => {
> + if (x.state && x.state === 'new') {
> + Object.assign(x, x.pending);
> + }
> +
> + if (x.ty === 'fabric') {
> + return Object.assign(x, { protocol: "ospf", name: x.area });
> + } else if (x.ty === 'node') {
> + let id = x.node_id.split("_");
> + return Object.assign(x,
> + {
> + protocol: "ospf",
> + node: id[1],
> + fabric: id[0],
> + },
> + );
> + } else {
> + return x;
> + }
> + });
Perhaps factor this out a bit into a separate function, making the
success() definition here a bit more succinct?
> + openfabric = openfabric.map(x => {
> + if (x.state && x.state === 'new') {
> + Object.assign(x, x.pending);
> + }
> +
> + if (x.ty === 'fabric') {
> + return Object.assign(x, { protocol: "openfabric", name: x.fabric_id });
> + } else if (x.ty === 'node') {
> + let id = x.node_id.split("_");
> + return Object.assign(x,
> + {
> + protocol: "openfabric",
> + node: id[1],
> + fabric: id[0],
> + },
> + );
> + } else {
> + return x;
> + }
> + });
^ same for the openfabric mapping
> +
> + let allFabrics = openfabric.concat(ospf);
> + let fabrics = allFabrics.filter(e => e.ty === "fabric").map((fabric) => {
> + if (!fabric.state || fabric.state !== 'deleted') {
> + fabric.children = allFabrics.filter(e => e.ty === "node")
> + .filter((node) =>
> + node.fabric === fabric.name && node.protocol === fabric.protocol)
> + .map((node) => {
> + Object.assign(node, {
> + leaf: true,
> + type: 'node',
> + iconCls: 'fa fa-desktop x-fa-treepanel',
> + name: node.node,
> + _fabric: fabric.name,
> + });
> +
> + return node;
> + });
^ and same here, moving it into a separate function instead of
open-coding it here. Would make the whole bit here more readable/easier
to understand.
> + }
> +
> + Object.assign(fabric, {
> + type: 'fabric',
> + protocol: fabric.protocol,
> + expanded: true,
> + name: fabric.fabric_id || fabric.area,
> + iconCls: 'fa fa-road x-fa-treepanel',
> + });
> +
> + return fabric;
> + });
> +
[..]
> +
> + addActionTreeColumn: function(_grid, _rI, _cI, _item, _e, rec) {
> + let me = this;
nit: never used, just drop it
> + this.addAction(rec);
> + },
> +
[..]
> +
> + deleteAction: function(table, rI, cI, item, e, { data }) {
> + let me = this;
> + let view = me.getView();
> +
> + Ext.Msg.show({
> + title: gettext('Confirm'),
> + icon: Ext.Msg.WARNING,
> + message: Ext.String.format(gettext('Are you sure you want to remove the fabric {0}?'), `${data.name}`),
nit: unnecessary string interpolation
> + buttons: Ext.Msg.YESNO,
> + defaultFocus: 'no',
> + callback: function(btn) {
> + if (btn !== 'yes') {
> + return;
> + }
> +
> + let url;
> + if (data.type === "node") {
> + url = `/cluster/sdn/fabrics/${data.protocol}/${data._fabric}/node/${data.name}`;
> + } else if (data.type === "fabric") {
> + url = `/cluster/sdn/fabrics/${data.protocol}/${data.name}`;
> + } else {
> + console.warn("deleteAction: missing type");
> + }
> +
> + Proxmox.Utils.API2Request({
> + url,
> + method: 'DELETE',
> + waitMsgTarget: view,
> + failure: function(response, opts) {
> + Ext.Msg.alert(gettext('Error'), response.htmlStatus);
Could use `Proxmox.Utils.errorText` here instead of `gettext('Error')`.
> + },
> + callback: me.reload.bind(me),
nit: `() => me.reload()` is already used multiple times in this file, so
use that here too for consistency? Think it's the preferred style
anyway.
> + });
> + },
> + });
> + },
> +
> + openAddOpenFabricWindow: function() {
> + let me = this;
> +
> + let window = Ext.create('PVE.sdn.Fabric.OpenFabric.Fabric.Edit', {
> + autoShow: true,
> + autoLoad: false,
> + isCreate: true,
> + });
> +
> + window.on('destroy', () => me.reload());
> + },
> +
> + openAddOspfWindow: function() {
> + let me = this;
> +
> + let window = Ext.create('PVE.sdn.Fabric.Ospf.Fabric.Edit', {
> + autoShow: true,
> + autoLoad: false,
> + isCreate: true,
> + });
> +
> + window.on('destroy', () => me.reload());
> + },
> +
> + init: function(view) {
> + let me = this;
> + me.reload();
> + },
> + },
> +});
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView
2025-04-02 9:50 ` Christoph Heiss
@ 2025-04-02 10:40 ` Gabriel Goller
0 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-04-02 10:40 UTC (permalink / raw)
To: Christoph Heiss; +Cc: Proxmox VE development discussion
On 02.04.2025 11:50, Christoph Heiss wrote:
>Some comments inline - did the review mostly in tandem with testing the
>UI, to get a better context.
>
>On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
>[..]
>> diff --git a/www/manager6/dc/Config.js b/www/manager6/dc/Config.js
>> index 74728c8320e9..68f7be8d6042 100644
>> --- a/www/manager6/dc/Config.js
>> +++ b/www/manager6/dc/Config.js
>> @@ -229,6 +229,14 @@ Ext.define('PVE.dc.Config', {
>> hidden: true,
>> iconCls: 'fa fa-shield',
>> itemId: 'sdnfirewall',
>> + },
>> + {
>> + xtype: 'pveSDNFabricView',
>> + groups: ['sdn'],
>> + title: gettext('Fabrics'),
>
>Do we really want to translate 'Fabrics'? Or rather just keep the name
>always at 'Fabrics' as the name of the concept/feature itself? Since it
>is a established term, after all. I'd keep it, IMHO.
>
>(But we seem to translate everything else here in the file, so really
>not sure.)
Hmm I mean it's probably the same in every language, but we also seem to
translate everything, even "VNET Firewall" and "IPAM", so IMO I'd leave
it just for the sake of consistency.
>> + hidden: true,
>> + iconCls: 'fa fa-road',
>> + itemId: 'sdnfabrics',
>> });
>> }
>>
>> diff --git a/www/manager6/sdn/FabricsView.js b/www/manager6/sdn/FabricsView.js
>> new file mode 100644
>> index 000000000000..0ef12defb1a8
>> --- /dev/null
>> +++ b/www/manager6/sdn/FabricsView.js
>[..]
>> +Ext.define('PVE.sdn.Fabric.View', {
>[..]
>> + {
>> + text: gettext('Protocol'),
>> + dataIndex: 'protocol',
>> + width: 100,
>> + renderer: function(value, metaData, rec) {
>> + if (rec.data.type !== 'fabric') {
>> + return "";
>> + }
>> +
>> + return PVE.Utils.render_sdn_pending(rec, value, 'protocol');
>> + },
>
>A mapping for the internal protocol name to a user-visible would be nice
>here, i.e. 'ospf' -> 'OSPF' and 'openfabric' -> 'OpenFabric'. Not much
>difference currently, but would look a bit better in the UI :)
Oh, that's a nice one, added this.
>> [snip]
>> + handler: 'addActionTreeColumn',
>> + getTip: (_v, _m, _rec) => gettext('Add'),
>
>nit: "Add Node" would be better here for node rows, if that's possible.
I agree.
>> + getClass: (_v, _m, { data }) => {
>> + if (data.type === 'fabric') {
>> + return 'fa fa-plus-circle';
>> + }
>> +
>> + return 'pmx-hidden';
>> + },
>> + isActionDisabled: (_v, _r, _c, _i, { data }) => data.type !== 'fabric',
>> + },
>> + {
>> + tooltip: gettext('Edit'),
>
>^ same as above
Here it's a bit different, because the Edit button is on Fabrics and
Nodes, so I'd have to add the getTip callback and format the type in it.
IMO this is not worth it.
>> + handler: 'editAction',
>> + getClass: (_v, _m, { data }) => {
>> + // the fabric type (openfabric, ospf, etc.) cannot be edited
>> + if (data.type) {
>> + return 'fa fa-pencil fa-fw';
>> + }
>> +
>> + return 'pmx-hidden';
>> + },
>> + isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
>> + },
>> + {
>> + tooltip: gettext('Delete'),
>
>^ and same here as well
Same as my answer above.
>> + handler: 'deleteAction',
>> + getClass: (_v, _m, { data }) => {
>> + // the fabric type (openfabric, ospf, etc.) cannot be deleted
>> + if (data.type) {
>> + return 'fa critical fa-trash-o';
>> + }
>> +
>> + return 'pmx-hidden';
>> + },
>> + isActionDisabled: (_v, _r, _c, _i, { data }) => !data.type,
>> + },
>> + ],
>> + },
>> + {
>> + header: gettext('Interfaces'),
>> + width: 100,
>> + dataIndex: 'interface',
>> + renderer: function(value, metaData, rec) {
>> + let interfaces = rec.data.pending?.interface || rec.data.interface || [];
>
>nit: could be const (see [0] tho regarding rules for const/let)
>
>[0] https://pve.proxmox.com/wiki/Javascript_Style_Guide#Variables
Yep.
>> [snip]
>> + initComponent: function() {
>> + let me = this;
>> +
>> +
>> + let add_button = new Proxmox.button.Button({
>
>New variables should generally be camelCase [0].
>
>[1] https://pve.proxmox.com/wiki/Javascript_Style_Guide#Casing
Fixed as well.
>> + text: gettext('Add Node'),
>> + handler: 'addActionTbar',
>> + disabled: true,
>> + });
>
>Since there is also an "add node" button in the "Action" column for each
>fabric, do we need a separate one in the top-bar as well?
We talked with Dominik off-list and he mentioned that in the
ResourceMapping the users didn't always understand what the button did or
how to add a "child". That's why we add both buttons.
>> +
>> + let set_add_button_status = function() {
>> + let selection = me.view.getSelection();
>> +
>> + if (selection.length === 0) {
>> + return;
>> + }
>> +
>> + add_button.setDisabled(selection[0].data.type !== 'fabric');
>> + };
>> +
>> + Ext.apply(me, {
>> + tbar: [
>> + {
>> + text: gettext('Add Fabric'),
>> + menu: [
>> + {
>> + text: gettext('OpenFabric'),
>
>'OpenFabric' also should not be translated, right? As its the name of
>the implementation/protocol.
Right.
>> + handler: 'openAddOpenFabricWindow',
>> + },
>> + {
>> + text: gettext('OSPF'),
>
>^ same here
Fixed it also.
>> [snip]
>> + controller: {
>> + xclass: 'Ext.app.ViewController',
>> +
>> + reload: function() {
>> + let me = this;
>> +
>> + Proxmox.Utils.API2Request({
>> + url: `/cluster/sdn/fabrics/?pending=1`,
>> + method: 'GET',
>> + success: function(response, opts) {
>> + let ospf = response.result.data.ospf;
>> + let openfabric = response.result.data.openfabric;
>> +
>> + // add some metadata so we can merge the objects later and still know the protocol/type
>> + ospf = ospf.map(x => {
>> + if (x.state && x.state === 'new') {
>> + Object.assign(x, x.pending);
>> + }
>> +
>> + if (x.ty === 'fabric') {
>> + return Object.assign(x, { protocol: "ospf", name: x.area });
>> + } else if (x.ty === 'node') {
>> + let id = x.node_id.split("_");
>> + return Object.assign(x,
>> + {
>> + protocol: "ospf",
>> + node: id[1],
>> + fabric: id[0],
>> + },
>> + );
>> + } else {
>> + return x;
>> + }
>> + });
>
>Perhaps factor this out a bit into a separate function, making the
>success() definition here a bit more succinct?
Done, created a few functions mapOpenFabric, mapOspf and mapTree.
>> [snip]
>^ and same here, moving it into a separate function instead of
>open-coding it here. Would make the whole bit here more readable/easier
>to understand.
See above.
>> + }
>> +
>> + Object.assign(fabric, {
>> + type: 'fabric',
>> + protocol: fabric.protocol,
>> + expanded: true,
>> + name: fabric.fabric_id || fabric.area,
>> + iconCls: 'fa fa-road x-fa-treepanel',
>> + });
>> +
>> + return fabric;
>> + });
>> +
>[..]
>> +
>> + addActionTreeColumn: function(_grid, _rI, _cI, _item, _e, rec) {
>> + let me = this;
>
>nit: never used, just drop it
Done.
>> +
>> + deleteAction: function(table, rI, cI, item, e, { data }) {
>> + let me = this;
>> + let view = me.getView();
>> +
>> + Ext.Msg.show({
>> + title: gettext('Confirm'),
>> + icon: Ext.Msg.WARNING,
>> + message: Ext.String.format(gettext('Are you sure you want to remove the fabric {0}?'), `${data.name}`),
>
>nit: unnecessary string interpolation
Oh, yes. Also added some quotes around the name, as it's more readable
that way.
>> + buttons: Ext.Msg.YESNO,
>> + defaultFocus: 'no',
>> + callback: function(btn) {
>> + if (btn !== 'yes') {
>> + return;
>> + }
>> +
>> + let url;
>> + if (data.type === "node") {
>> + url = `/cluster/sdn/fabrics/${data.protocol}/${data._fabric}/node/${data.name}`;
>> + } else if (data.type === "fabric") {
>> + url = `/cluster/sdn/fabrics/${data.protocol}/${data.name}`;
>> + } else {
>> + console.warn("deleteAction: missing type");
>> + }
>> +
>> + Proxmox.Utils.API2Request({
>> + url,
>> + method: 'DELETE',
>> + waitMsgTarget: view,
>> + failure: function(response, opts) {
>> + Ext.Msg.alert(gettext('Error'), response.htmlStatus);
>
>Could use `Proxmox.Utils.errorText` here instead of `gettext('Error')`.
Nice!
>> + },
>> + callback: me.reload.bind(me),
>
>nit: `() => me.reload()` is already used multiple times in this file, so
>use that here too for consistency? Think it's the preferred style
>anyway.
Right.
>> [snip]
Thanks for the review!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* [pve-devel] [PATCH pve-manager 7/7] utils: avoid line-break in pending changes message
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (49 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics Gabriel Goller
` (2 subsequent siblings)
53 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Remove line-break on sdn "pending configuration" message on removed sdn
objects.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Co-authored-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
www/manager6/Utils.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index aa415759ca27..52197e538213 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -192,7 +192,7 @@ Ext.define('PVE.Utils', {
if (value === undefined) {
return ' ';
} else {
- return `<div style="text-decoration: line-through;">${Ext.htmlEncode(value)}</div>`;
+ return `<span style="text-decoration: line-through;">${Ext.htmlEncode(value)}</span>`;
}
} else if (rec.data.pending[key] !== undefined && rec.data.pending[key] !== null) {
if (rec.data.pending[key] === 'deleted') {
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (50 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 7/7] utils: avoid line-break in pending changes message Gabriel Goller
@ 2025-03-28 17:13 ` Gabriel Goller
2025-03-31 8:44 ` Shannon Sterz
2025-04-02 8:49 ` Christoph Heiss
2025-04-03 8:30 ` [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Friedrich Weber
2025-04-04 10:55 ` Hannes Duerr
53 siblings, 2 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-03-28 17:13 UTC (permalink / raw)
To: pve-devel
Add initial documentation for the openfabric and ospf options.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
pvesdn.adoc | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 155 insertions(+)
diff --git a/pvesdn.adoc b/pvesdn.adoc
index 5d5d27bfbc1f..feb6898beaa5 100644
--- a/pvesdn.adoc
+++ b/pvesdn.adoc
@@ -517,6 +517,161 @@ Loopback:: Use a loopback or dummy interface as the source of the EVPN network
(for multipath).
+[[pvesdn_config_fabrics]]
+Fabrics
+-------
+
+Fabrics in {pve} SDN provide automated routing between nodes in a cluster. They
+simplify the configuration of underlay networks between nodes to form the
+foundation for SDN deployments.
+
+Fabrics in {pve} automatically configure routing protocols on your physical
+network interfaces to establish connectivity between nodes in the cluster. This
+creates a resilient, auto-configuring network fabric that adapts to changes in
+network topology.
+
+Installation
+~~~~~~~~~~~~
+
+We use the FRR implementations of OpenFabric and OSPF, so first you need to
+install `frr` and the `frr-pythontools` package:
+
+----
+apt update
+apt install frr frr-pythontools
+----
+
+Configuration
+~~~~~~~~~~~~~
+
+To create a Fabric, head over to Datacenter->SDN->Fabrics and click "Add
+Fabric" to create a new fabric. After selecting the preferred protocol, the
+fabric is created. With the "+" button you can select the nodes which you want
+to add to the fabric, you also have to select the interfaces used to
+communicate to the other nodes.
+
+Router-ID Selection
+^^^^^^^^^^^^^^^^^^^
+
+Each node in a fabric needs a unique router ID, which is an IPv4 (or IPv6 in
+OpenFabric) address in dotted-decimal notation (e.g., 192.168.1.1).
+
+Loopback Prefix
+^^^^^^^^^^^^^^^
+
+You can specify a CIDR network range (e.g., 10.0.0.0/24) as a loopback prefix for the fabric.
+When configured, the system will automatically verify that all router-IDs are contained within
+this prefix. This ensures consistency in your addressing scheme and helps prevent addressing
+conflicts or errors. The loopback prefix applies to the entire fabric and is optional.
+
+[[pvesdn_openfabric]]
+OpenFabric
+~~~~~~~~~~
+
+OpenFabric is a routing protocol specifically designed for data center fabrics.
+It's based on IS-IS and optimized for the leaf-spine topology common in data
+centers.
+
+Configuration options:
+
+[[pvesdn_openfabric_fabric]]
+On the Fabric
+^^^^^^^^^^^^^
+
+Name:: This is the name of the OpenFabric fabric and can be at most 8 characters long.
+
+Loopback Prefix:: CIDR (IPv4 or IPv6) network range (e.g., 10.0.0.0/24) used to verify that
+all router-IDs in the fabric are contained within this prefix.
+
+Hello Interval:: Controls how frequently (in seconds) hello packets are sent to
+discover and maintain connections with neighboring nodes. Lower values detect
+failures faster but increase network traffic. If empty, the default value will
+be used. This option is global on the fabric, meaning every interface on every
+node in this fabric will inherit this hello-interval property.
+
+[[pvesdn_openfabric_node]]
+On the Node
+^^^^^^^^^^^
+
+Node:: Select the node which will be added to the fabric. Only nodes that
+currently are in the cluster will be shown.
+
+Router-ID:: A unique IPv4 or IPv6 address used to generate the OpenFabric
+Network Entity Title (NET). Each node in the same fabric must have a different
+Router-ID, while a single node must use the same NET address across all fabrics
+(this consistency is automatically managed by {pve}).
+
+NOTE: When using IPv6 addresses, we use the last 3 segments to generate the
+NET. Ensure these segments differ between nodes.
+
+Interfaces:: Specify the interfaces used to establish peering connections with
+other OpenFabric nodes. Preferably select interfaces without pre-assigned IP
+addresses, then configure addresses in the IPv4/IPv6 column if needed. A dummy
+"loopback" interface with the router-id is automatically created.
+Interface-specific settings override the global fabric settings.
+
+The following optional parameters can be configured per interface when enabling
+the additional columns:
+
+Passive::: When enabled, the interface will not form OpenFabric adjacencies but
+its networks will still be advertised.
+
+Hello Interval::: Controls how frequently (in seconds) hello packets are sent
+on this specific interface. Lower values detect failures faster but increase
+network traffic.
+
+CSNP Interval::: Controls how frequently (in seconds) Complete Sequence Number
+PDUs are sent. CSNPs contain a complete list of all LSPs in the database.
+
+Hello Multiplier::: Defines how many missed hello packets constitute a failed
+connection. Higher values make the connection more resilient to packet loss but
+slow down failure detection.
+
+[[pvesdn_ospf]]
+OSPF
+~~~~
+
+OSPF (Open Shortest Path First) is a widely-used link-state routing protocol
+that efficiently calculates the shortest path for routing traffic through IP
+networks.
+
+[[pvesdn_ospf_fabric]]
+On the Fabric
+^^^^^^^^^^^^^
+
+Area:: This specifies the OSPF area identifier, which can be either an integer
+(i32) or an IP address. Areas are a way to organize and structure OSPF networks
+hierarchically, with Area 0 (or 0.0.0.0) serving as the backbone area.
+
+Loopback Prefix:: CIDR (only IPv4) network range (e.g., 10.0.0.0/24) used to
+verify that all router-IDs in the fabric are contained within this prefix.
+
+Area:: This specifies the OSPF area identifier, which can be either an integer
+(i32) or an IP address. Areas are a way to organize and structure OSPF networks
+hierarchically, with Area 0 (or 0.0.0.0) serving as the backbone area.
+
+[[pvesdn_ospf_node]]
+On the Node
+^^^^^^^^^^^
+
+Node:: Select the node which will be added to the fabric. Only nodes that
+currently are in the cluster will be shown.
+
+Router-ID:: A unique IPv4 address used to identify this router within the OSPF
+network. Each node in the same fabric must have a different Router-ID.
+
+Interfaces:: Specify the interfaces used to establish peering connections with
+other OSPF nodes. Preferably select interfaces without pre-assigned IP
+addresses, then configure addresses in the IPv4 column if needed. A dummy
+"loopback" interface with the router-id is automatically created.
+
+The following optional parameter can be configured per interface when enabling
+the additional columns:
+
+Passive::: When enabled, the interface will not form OSPF adjacencies but
+its networks will still be advertised.
+
+
[[pvesdn_config_ipam]]
IPAM
----
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-03-28 17:13 ` [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics Gabriel Goller
@ 2025-03-31 8:44 ` Shannon Sterz
2025-03-31 12:24 ` Gabriel Goller
2025-04-02 8:49 ` Christoph Heiss
1 sibling, 1 reply; 97+ messages in thread
From: Shannon Sterz @ 2025-03-31 8:44 UTC (permalink / raw)
To: Proxmox VE development discussion; +Cc: pve-devel
On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
> Add initial documentation for the openfabric and ospf options.
>
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
> pvesdn.adoc | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 155 insertions(+)
>
> diff --git a/pvesdn.adoc b/pvesdn.adoc
> index 5d5d27bfbc1f..feb6898beaa5 100644
> --- a/pvesdn.adoc
> +++ b/pvesdn.adoc
> @@ -517,6 +517,161 @@ Loopback:: Use a loopback or dummy interface as the source of the EVPN network
> (for multipath).
>
>
> +[[pvesdn_config_fabrics]]
> +Fabrics
> +-------
> +
> +Fabrics in {pve} SDN provide automated routing between nodes in a cluster. They
> +simplify the configuration of underlay networks between nodes to form the
> +foundation for SDN deployments.
> +
> +Fabrics in {pve} automatically configure routing protocols on your physical
> +network interfaces to establish connectivity between nodes in the cluster. This
> +creates a resilient, auto-configuring network fabric that adapts to changes in
> +network topology.
feels strange to have two adjacent paragraphs start with "Fabrics in
Proxmox VE" you could do something "You can use Fabrics to
automatically..." or just "They" imo.
> +
> +Installation
> +~~~~~~~~~~~~
> +
> +We use the FRR implementations of OpenFabric and OSPF, so first you need to
> +install `frr` and the `frr-pythontools` package:
> +
> +----
> +apt update
> +apt install frr frr-pythontools
> +----
> +
> +Configuration
> +~~~~~~~~~~~~~
> +
> +To create a Fabric, head over to Datacenter->SDN->Fabrics and click "Add
> +Fabric" to create a new fabric. After selecting the preferred protocol, the
starting and ending the sentence with "To create a (new) Fabric" is
redundant. lose the "to create a new fabric." at the end.
> +fabric is created. With the "+" button you can select the nodes which you want
> +to add to the fabric, you also have to select the interfaces used to
> +communicate to the other nodes.
nit: with the other nodes.
> +
> +Router-ID Selection
> +^^^^^^^^^^^^^^^^^^^
> +
> +Each node in a fabric needs a unique router ID, which is an IPv4 (or IPv6 in
> +OpenFabric) address in dotted-decimal notation (e.g., 192.168.1.1).
does this apply to v6 too? i've never seen IPv6 represented in dotted
decimal notation. imo if you mention IPv6 here, you should specify it's
representation. maybe:
Each node in a fabric needs a unique router ID, which is an IPv4 address
in dotted decimal notation (e.g. 192.168.1.1). In OpenFabric this can
also be an IPv6 address in the typical hexadecimal representation
separated by colons (e.g., 2001:db8::1428:57ab).
> +
> +Loopback Prefix
> +^^^^^^^^^^^^^^^
> +
> +You can specify a CIDR network range (e.g., 10.0.0.0/24) as a loopback prefix for the fabric.
> +When configured, the system will automatically verify that all router-IDs are contained within
> +this prefix. This ensures consistency in your addressing scheme and helps prevent addressing
> +conflicts or errors. The loopback prefix applies to the entire fabric and is optional.
> +
> +[[pvesdn_openfabric]]
> +OpenFabric
> +~~~~~~~~~~
> +
> +OpenFabric is a routing protocol specifically designed for data center fabrics.
> +It's based on IS-IS and optimized for the leaf-spine topology common in data
> +centers.
> +
> +Configuration options:
> +
> +[[pvesdn_openfabric_fabric]]
> +On the Fabric
> +^^^^^^^^^^^^^
> +
> +Name:: This is the name of the OpenFabric fabric and can be at most 8 characters long.
> +
> +Loopback Prefix:: CIDR (IPv4 or IPv6) network range (e.g., 10.0.0.0/24) used to verify that
> +all router-IDs in the fabric are contained within this prefix.
> +
> +Hello Interval:: Controls how frequently (in seconds) hello packets are sent to
> +discover and maintain connections with neighboring nodes. Lower values detect
> +failures faster but increase network traffic. If empty, the default value will
what is the default value? would it make sense to mention that here?
> +be used. This option is global on the fabric, meaning every interface on every
> +node in this fabric will inherit this hello-interval property.
> +
> +[[pvesdn_openfabric_node]]
> +On the Node
> +^^^^^^^^^^^
> +
> +Node:: Select the node which will be added to the fabric. Only nodes that
> +currently are in the cluster will be shown.
> +
> +Router-ID:: A unique IPv4 or IPv6 address used to generate the OpenFabric
> +Network Entity Title (NET). Each node in the same fabric must have a different
> +Router-ID, while a single node must use the same NET address across all fabrics
> +(this consistency is automatically managed by {pve}).
> +
> +NOTE: When using IPv6 addresses, we use the last 3 segments to generate the
> +NET. Ensure these segments differ between nodes.
would it make sense to make this a `WARNING` instead of a `NOTE`? sounds
like this is a bit more important to get right.
> +Interfaces:: Specify the interfaces used to establish peering connections with
> +other OpenFabric nodes. Preferably select interfaces without pre-assigned IP
> +addresses, then configure addresses in the IPv4/IPv6 column if needed. A dummy
> +"loopback" interface with the router-id is automatically created.
> +Interface-specific settings override the global fabric settings.
> +
> +The following optional parameters can be configured per interface when enabling
> +the additional columns:
> +
> +Passive::: When enabled, the interface will not form OpenFabric adjacencies but
> +its networks will still be advertised.
> +
> +Hello Interval::: Controls how frequently (in seconds) hello packets are sent
> +on this specific interface. Lower values detect failures faster but increase
> +network traffic.
> +
> +CSNP Interval::: Controls how frequently (in seconds) Complete Sequence Number
> +PDUs are sent. CSNPs contain a complete list of all LSPs in the database.
> +
> +Hello Multiplier::: Defines how many missed hello packets constitute a failed
> +connection. Higher values make the connection more resilient to packet loss but
> +slow down failure detection.
> +
> +[[pvesdn_ospf]]
> +OSPF
> +~~~~
> +
> +OSPF (Open Shortest Path First) is a widely-used link-state routing protocol
> +that efficiently calculates the shortest path for routing traffic through IP
> +networks.
> +
> +[[pvesdn_ospf_fabric]]
> +On the Fabric
> +^^^^^^^^^^^^^
> +
> +Area:: This specifies the OSPF area identifier, which can be either an integer
> +(i32) or an IP address. Areas are a way to organize and structure OSPF networks
i32 is super intuitive for Rust programmers but "32-bit signed integer"
would be clearer to everyone else ;)
> +hierarchically, with Area 0 (or 0.0.0.0) serving as the backbone area.
> +
> +Loopback Prefix:: CIDR (only IPv4) network range (e.g., 10.0.0.0/24) used to
> +verify that all router-IDs in the fabric are contained within this prefix.
> +
> +Area:: This specifies the OSPF area identifier, which can be either an integer
> +(i32) or an IP address. Areas are a way to organize and structure OSPF networks
same here :)
> +hierarchically, with Area 0 (or 0.0.0.0) serving as the backbone area.
> +
> +[[pvesdn_ospf_node]]
> +On the Node
> +^^^^^^^^^^^
> +
> +Node:: Select the node which will be added to the fabric. Only nodes that
> +currently are in the cluster will be shown.
"that are currently in..."
> +
> +Router-ID:: A unique IPv4 address used to identify this router within the OSPF
> +network. Each node in the same fabric must have a different Router-ID.
> +
> +Interfaces:: Specify the interfaces used to establish peering connections with
> +other OSPF nodes. Preferably select interfaces without pre-assigned IP
> +addresses, then configure addresses in the IPv4 column if needed. A dummy
> +"loopback" interface with the router-id is automatically created.
> +
> +The following optional parameter can be configured per interface when enabling
> +the additional columns:
> +
> +Passive::: When enabled, the interface will not form OSPF adjacencies but
> +its networks will still be advertised.
> +
> +
> [[pvesdn_config_ipam]]
> IPAM
> ----
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-03-31 8:44 ` Shannon Sterz
@ 2025-03-31 12:24 ` Gabriel Goller
2025-04-02 8:43 ` Gabriel Goller
0 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-03-31 12:24 UTC (permalink / raw)
To: Shannon Sterz; +Cc: pve-devel, Proxmox VE development discussion
On 31.03.2025 10:44, Shannon Sterz wrote:
>On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
>> [snip]
I agree with everthing above.
>> +
>> +Router-ID Selection
>> +^^^^^^^^^^^^^^^^^^^
>> +
>> +Each node in a fabric needs a unique router ID, which is an IPv4 (or IPv6 in
>> +OpenFabric) address in dotted-decimal notation (e.g., 192.168.1.1).
>
>does this apply to v6 too? i've never seen IPv6 represented in dotted
>decimal notation. imo if you mention IPv6 here, you should specify it's
>representation. maybe:
>
>Each node in a fabric needs a unique router ID, which is an IPv4 address
>in dotted decimal notation (e.g. 192.168.1.1). In OpenFabric this can
>also be an IPv6 address in the typical hexadecimal representation
>separated by colons (e.g., 2001:db8::1428:57ab).
Oops, yeah I forgot this.
>> [snip]
>> +Name:: This is the name of the OpenFabric fabric and can be at most 8 characters long.
>> +
>> +Loopback Prefix:: CIDR (IPv4 or IPv6) network range (e.g., 10.0.0.0/24) used to verify that
>> +all router-IDs in the fabric are contained within this prefix.
>> +
>> +Hello Interval:: Controls how frequently (in seconds) hello packets are sent to
>> +discover and maintain connections with neighboring nodes. Lower values detect
>> +failures faster but increase network traffic. If empty, the default value will
>
>what is the default value? would it make sense to mention that here?
I decided against using default values as I wanted FRR to handle them.
We also don't set default-options in the FRR config, but just delete the
property and let FRR handle it.
Maybe I could write the: "the default FRR value will be used"?
>> +be used. This option is global on the fabric, meaning every interface on every
>> +node in this fabric will inherit this hello-interval property.
>> +
>> +[[pvesdn_openfabric_node]]
>> +On the Node
>> +^^^^^^^^^^^
>> +
>> +Node:: Select the node which will be added to the fabric. Only nodes that
>> +currently are in the cluster will be shown.
>> +
>> +Router-ID:: A unique IPv4 or IPv6 address used to generate the OpenFabric
>> +Network Entity Title (NET). Each node in the same fabric must have a different
>> +Router-ID, while a single node must use the same NET address across all fabrics
>> +(this consistency is automatically managed by {pve}).
>> +
>> +NOTE: When using IPv6 addresses, we use the last 3 segments to generate the
>> +NET. Ensure these segments differ between nodes.
>
>would it make sense to make this a `WARNING` instead of a `NOTE`? sounds
>like this is a bit more important to get right.
yep, I agree.
>> [snip]
>> +[[pvesdn_ospf_fabric]]
>> +On the Fabric
>> +^^^^^^^^^^^^^
>> +
>> +Area:: This specifies the OSPF area identifier, which can be either an integer
>> +(i32) or an IP address. Areas are a way to organize and structure OSPF networks
>
>i32 is super intuitive for Rust programmers but "32-bit signed integer"
>would be clearer to everyone else ;)
Will fix this as well.
Thanks for looking over this! The docs are still quite spare, so I hope
I'll get around adding more stuff for the next version.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-03-31 12:24 ` Gabriel Goller
@ 2025-04-02 8:43 ` Gabriel Goller
0 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-04-02 8:43 UTC (permalink / raw)
To: Shannon Sterz, Proxmox VE development discussion, pve-devel
>>>[snip]
>>>+Name:: This is the name of the OpenFabric fabric and can be at most 8 characters long.
>>>+
>>>+Loopback Prefix:: CIDR (IPv4 or IPv6) network range (e.g., 10.0.0.0/24) used to verify that
>>>+all router-IDs in the fabric are contained within this prefix.
>>>+
>>>+Hello Interval:: Controls how frequently (in seconds) hello packets are sent to
>>>+discover and maintain connections with neighboring nodes. Lower values detect
>>>+failures faster but increase network traffic. If empty, the default value will
>>
>>what is the default value? would it make sense to mention that here?
>
>I decided against using default values as I wanted FRR to handle them.
>We also don't set default-options in the FRR config, but just delete the
>property and let FRR handle it.
>
>Maybe I could write the: "the default FRR value will be used"?
I changed my mind, I'll include the default value :)
FRR also doesn't show it in the docs (for openfabric at least) and I
guess it's quite useful for developers to see if they need/want to set
it manually.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-03-28 17:13 ` [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics Gabriel Goller
2025-03-31 8:44 ` Shannon Sterz
@ 2025-04-02 8:49 ` Christoph Heiss
2025-04-02 9:09 ` Gabriel Goller
1 sibling, 1 reply; 97+ messages in thread
From: Christoph Heiss @ 2025-04-02 8:49 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox VE development discussion
On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
[..]
> +
> +Installation
> +~~~~~~~~~~~~
> +
> +We use the FRR implementations of OpenFabric and OSPF, so first you need to
> +install `frr` and the `frr-pythontools` package:
Rather try to avoid first-person, as per our style guide [0].
Could be rephrased as e.g.
The FRR implementations of OpenFabric and OSPF are used, so first the
`frr` and `frr-pythontools` packages must be installed:
[0] https://pve.proxmox.com/wiki/Technical_Writing_Style_Guide#Avoid_first_person
> +
> +----
> +apt update
> +apt install frr frr-pythontools
> +----
> +
[..]
> +
> +[[pvesdn_openfabric_node]]
> +On the Node
> +^^^^^^^^^^^
> +
> +Node:: Select the node which will be added to the fabric. Only nodes that
> +currently are in the cluster will be shown.
> +
> +Router-ID:: A unique IPv4 or IPv6 address used to generate the OpenFabric
> +Network Entity Title (NET). Each node in the same fabric must have a different
> +Router-ID, while a single node must use the same NET address across all fabrics
> +(this consistency is automatically managed by {pve}).
> +
> +NOTE: When using IPv6 addresses, we use the last 3 segments to generate the
> +NET. Ensure these segments differ between nodes.
Same here w.r.t. first person ("we use").
> +
> +Interfaces:: Specify the interfaces used to establish peering connections with
> +other OpenFabric nodes. Preferably select interfaces without pre-assigned IP
> +addresses, then configure addresses in the IPv4/IPv6 column if needed. A dummy
> +"loopback" interface with the router-id is automatically created.
> +Interface-specific settings override the global fabric settings.
> +
> +The following optional parameters can be configured per interface when enabling
> +the additional columns:
Perhaps this sentence should be made a bit more prominent, e.g. as
sub-heading? It's easy to read over it and miss it, but it's quite
important piece of information. Especially if your not *that* familiar
with the UI and enablable columns.
There are advanced options, so hiding them by default is good IMO - just
a bit confusing to have big headings with the option names but nowhere
to enable them (directly).
[..]
> +
> +[[pvesdn_ospf_node]]
> +On the Node
> +^^^^^^^^^^^
> +
> +Node:: Select the node which will be added to the fabric. Only nodes that
> +currently are in the cluster will be shown.
> +
> +Router-ID:: A unique IPv4 address used to identify this router within the OSPF
> +network. Each node in the same fabric must have a different Router-ID.
> +
> +Interfaces:: Specify the interfaces used to establish peering connections with
> +other OSPF nodes. Preferably select interfaces without pre-assigned IP
> +addresses, then configure addresses in the IPv4 column if needed. A dummy
> +"loopback" interface with the router-id is automatically created.
> +
> +The following optional parameter can be configured per interface when enabling
> +the additional columns:
^ Same as above.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-04-02 8:49 ` Christoph Heiss
@ 2025-04-02 9:09 ` Gabriel Goller
2025-04-02 9:16 ` Christoph Heiss
0 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-04-02 9:09 UTC (permalink / raw)
To: Christoph Heiss; +Cc: Proxmox VE development discussion
On 02.04.2025 10:49, Christoph Heiss wrote:
>On Fri Mar 28, 2025 at 6:13 PM CET, Gabriel Goller wrote:
>[..]
>> +
>> +Installation
>> +~~~~~~~~~~~~
>> +
>> +We use the FRR implementations of OpenFabric and OSPF, so first you need to
>> +install `frr` and the `frr-pythontools` package:
>
>Rather try to avoid first-person, as per our style guide [0].
>
>Could be rephrased as e.g.
>
> The FRR implementations of OpenFabric and OSPF are used, so first the
> `frr` and `frr-pythontools` packages must be installed:
>
>[0] https://pve.proxmox.com/wiki/Technical_Writing_Style_Guide#Avoid_first_person
Oops, yeah my oversight.
>> +
>> +----
>> +apt update
>> +apt install frr frr-pythontools
>> +----
>> +
>[..]
>> +
>> +[[pvesdn_openfabric_node]]
>> +On the Node
>> +^^^^^^^^^^^
>> +
>> +Node:: Select the node which will be added to the fabric. Only nodes that
>> +currently are in the cluster will be shown.
>> +
>> +Router-ID:: A unique IPv4 or IPv6 address used to generate the OpenFabric
>> +Network Entity Title (NET). Each node in the same fabric must have a different
>> +Router-ID, while a single node must use the same NET address across all fabrics
>> +(this consistency is automatically managed by {pve}).
>> +
>> +NOTE: When using IPv6 addresses, we use the last 3 segments to generate the
>> +NET. Ensure these segments differ between nodes.
>
>Same here w.r.t. first person ("we use").
Fixed this as well.
>> +
>> +Interfaces:: Specify the interfaces used to establish peering connections with
>> +other OpenFabric nodes. Preferably select interfaces without pre-assigned IP
>> +addresses, then configure addresses in the IPv4/IPv6 column if needed. A dummy
>> +"loopback" interface with the router-id is automatically created.
>> +Interface-specific settings override the global fabric settings.
>> +
>> +The following optional parameters can be configured per interface when enabling
>> +the additional columns:
>
>Perhaps this sentence should be made a bit more prominent, e.g. as
>sub-heading? It's easy to read over it and miss it, but it's quite
>important piece of information. Especially if your not *that* familiar
>with the UI and enablable columns.
>
>There are advanced options, so hiding them by default is good IMO - just
>a bit confusing to have big headings with the option names but nowhere
>to enable them (directly).
I thought about adding section (even though this is not exactly a
different panel in the UI), e.g.,
On The Interface
^^^^^^^^^^^^^^^^
So we'd have:
OpenFabric
- On the Node
- On the Interface
- On the Fabric
and obviously the same with OSPF.
What do you think?
Thanks for looking through this!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics
2025-04-02 9:09 ` Gabriel Goller
@ 2025-04-02 9:16 ` Christoph Heiss
0 siblings, 0 replies; 97+ messages in thread
From: Christoph Heiss @ 2025-04-02 9:16 UTC (permalink / raw)
To: Gabriel Goller; +Cc: Proxmox VE development discussion
On Wed Apr 2, 2025 at 11:09 AM CEST, Gabriel Goller wrote:
[..]
>>> +Interfaces:: Specify the interfaces used to establish peering connections with
>>> +other OpenFabric nodes. Preferably select interfaces without pre-assigned IP
>>> +addresses, then configure addresses in the IPv4/IPv6 column if needed. A dummy
>>> +"loopback" interface with the router-id is automatically created.
>>> +Interface-specific settings override the global fabric settings.
>>> +
>>> +The following optional parameters can be configured per interface when enabling
>>> +the additional columns:
>>
>>Perhaps this sentence should be made a bit more prominent, e.g. as
>>sub-heading? It's easy to read over it and miss it, but it's quite
>>important piece of information. Especially if your not *that* familiar
>>with the UI and enablable columns.
>>
>>There are advanced options, so hiding them by default is good IMO - just
>>a bit confusing to have big headings with the option names but nowhere
>>to enable them (directly).
>
> I thought about adding section (even though this is not exactly a
> different panel in the UI), e.g.,
>
> On The Interface
> ^^^^^^^^^^^^^^^^
>
> So we'd have:
> OpenFabric
> - On the Node
> - On the Interface
> - On the Fabric
>
> and obviously the same with OSPF.
>
> What do you think?
Yeah, sounds good to me! Makes it clear(er) what settings belong to what
part of the fabric and hopefully avoid confusion as to where to
configure each setting exactly.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (51 preceding siblings ...)
2025-03-28 17:13 ` [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics Gabriel Goller
@ 2025-04-03 8:30 ` Friedrich Weber
2025-04-03 10:21 ` Gabriel Goller
2025-04-04 10:55 ` Hannes Duerr
53 siblings, 1 reply; 97+ messages in thread
From: Friedrich Weber @ 2025-04-03 8:30 UTC (permalink / raw)
To: Proxmox VE development discussion, Gabriel Goller
On 28/03/2025 18:12, Gabriel Goller wrote:
> This series allows the user to add fabrics such as OpenFabric and OSPF over
> their clusters.
>
> Overview
> ========
>
> This series allows the user to create routed networks ('fabrics') across their
> clusters, which can be used as the underlay network for a EVPN cluster, or for
> creating Ceph full mesh clusters easily.
>
> This patch series adds the initial support for two routing protocols:
> * OpenFabric
> * OSPF
I tested a bit with packages provided Gabriel built for me (thanks!),
both OSPF and OpenFabric, and also set up a Ceph full mesh over OpenFabric.
Overall it looked quite smooth! I didn't notice huge issues, but have
some minor points below:
- I think the error message when frr+frr-pythontools is not installed
looked a bit scary. It's on me for not reading the docs, but still,
might be nice to have a friendlier error message in that case :)
- having already added one node, and then adding another using the "Add
Node" dialog, it has happened multiple times that I kept "Node" at the
default first node (which I already had defined) while I thought I was
configuring the second one, and only noticed when I submitted and got
"node already exists". And then, when I change the "Node" to the correct
one, I lost my form input :) I understand that we need to reload when
changing "Node" (the other node might have other interfaces), but to
avoid the above, maybe the dialog could preselect a node that is not yet
defined?
- when removing a fabric, the IP addresses defined on the interfaces
remain until the next reboot. I guess the reason is that ifupdown2
doesn't remove IP addresses when the corresponding stanza vanishes. Not
sure if this can be easily fixed -- if not, maybe this would be worth a
note in the docs?
- when removing the only fabric and applying, the srvreload task has a
couple of spurious error messages:
> 2025-04-03 09:35:59,354 ^[[91m ERROR^[[0m: Filename /etc/frr/frr.conf is an empty file
> frr reload command fail: command '/usr/lib/frr/frr-reload.py --stdout --reload /etc/frr/frr.conf' failed: exit code 1
> Restarting frr. at /usr/share/perl5/PVE/Network/SDN/Frr.pm line 74.
> TASK OK
- regarding the hello/csnp intervals: it would be nice to mention what the
default values are. Also, probably not relevant for this patch series, but
wanted to mention anyway: For running a Ceph full mesh over a fabric,
one probably wants to set relatively low values here (as our wiki guide
does [3])? If there is a guide in the future for setting up Ceph full mesh
over fabric, would be nice if the guide would mention that.
- I'm not so sure about this, but maybe it would be nice to show the
default-hidden hello/csnp interval columns if I have entered a value
there?
- when I remove hello interval+multiplier and the csnp via the GUI, I get
the following warning in the journal:
> Apr 03 10:20:50 fabric159 pveproxy[9244]: Use of uninitialized value $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/Network/SDN/Fabrics.pm line 330.
> Apr 03 10:21:02 fabric159 pveproxy[9246]: Use of uninitialized value $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/Network/SDN/Fabrics.pm line 330.
> Apr 03 10:21:02 fabric159 pveproxy[9246]: Use of uninitialized value $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/Network/SDN/Fabrics.pm line 330.
- after setting up an OSPF fabric in a 3-node full mesh, I couldn't ping
the loopback addresses until I rebooted all nodes. I've attached the
task logs of the srvreloads and the ospf.cfg below [1]. After a reboot,
the pings work fine. Could it be because an OSPF with the same area
existed previously?
- probably a user error, but: after setting up an OpenFabric fabric and
rebooting, the routes didn't come up automatically. My openfabric.cfg is
in [2]. systemctl status frr shows the following:
> Apr 03 10:02:20 fabric159 systemd[1]: Started frr.service - FRRouting.
> Apr 03 10:02:21 fabric159 fabricd[699]: [NBV6R-CM3PT] OpenFabric: Needed to resync LSPDB using CSNP!
> Apr 03 10:03:48 fabric159 fabricd[699]: [QBAZ6-3YZR3] OpenFabric: Could not find two T0 routers
> Apr 03 10:02:23 fabric160 systemd[1]: Started frr.service - FRRouting.
> Apr 03 10:02:24 fabric160 fabricd[674]: [MZS0T-YRAMC] OpenFabric: Initial synchronization on ens19 complete.
> Apr 03 10:03:48 fabric160 fabricd[674]: [QBAZ6-3YZR3] OpenFabric: Could not find two T0 routers
> Apr 03 10:02:19 fabric161 systemd[1]: Started frr.service - FRRouting.
> Apr 03 10:02:21 fabric161 fabricd[681]: [MZS0T-YRAMC] OpenFabric: Initial synchronization on ens20 complete.
> Apr 03 10:03:48 fabric161 fabricd[681]: [QBAZ6-3YZR3] OpenFabric: Could not find two T0 routers
Maybe I'm just too impatient, but estarting frr and waiting for ~30 seconds fixes it.
[1]
fabric159:
2025-04-03 09:30:06,673 INFO: Called via "Namespace(input=None, reload=True, test=False, debug=False, log_level='info', stdout=True, pathspace=None, filename='/etc/frr/frr.conf', overwrite=False, bindir='/usr/bin', confdir='/etc/frr', rundir='/var/run/frr', vty_socket=None, daemon='', test_reset=False)"
2025-04-03 09:30:06,673 INFO: Loading Config object from file /etc/frr/frr.conf
2025-04-03 09:30:06,690 INFO: Loading Config object from vtysh show running
2025-04-03 09:30:06,697 INFO: "frr defaults traditional" cannot be removed
2025-04-03 09:30:06,703 INFO: Executed "ip forwarding"
2025-04-03 09:30:06,709 INFO: Executed "ipv6 forwarding"
2025-04-03 09:30:06,709 INFO: /var/run/frr/reload-B14N3D.txt content
['frr defaults datacenter\n',
'log syslog informational\n',
'router ospf\nexit\n',
'router ospf\n ospf router-id 172.16.0.159\nexit\n',
'interface dummy_1234\nexit\n',
'interface dummy_1234\n ip ospf area 1234\nexit\n',
'interface dummy_1234\n ip ospf passive\nexit\n',
'interface ens19\nexit\n',
'interface ens19\n ip ospf area 1234\nexit\n',
'interface ens20\nexit\n',
'interface ens20\n ip ospf area 1234\nexit\n',
'access-list ospf_1234_ips permit 172.16.0.0/24\n',
'route-map ospf permit 100\nexit\n',
'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
'route-map ospf permit 100\n set src 172.16.0.159\nexit\n',
'ip protocol ospf route-map ospf\n',
'line vty\nexit\n']
[1667|mgmtd] sending configuration
[1668|zebra] sending configuration
[1671|ospfd] sending configuration
[1674|bgpd] sending configuration
[1668|zebra] done
[1682|watchfrr] sending configuration
[1684|staticd] sending configuration
[1685|bfdd] sending configuration
Waiting for children to finish applying config...
[1682|watchfrr] done
[1674|bgpd] done
[1684|staticd] done
[1685|bfdd] done
[1667|mgmtd] done
[1671|ospfd] done
2025-04-03 09:30:06,721 INFO: Loading Config object from vtysh show running
2025-04-03 09:30:06,729 INFO: /var/run/frr/reload-UJJQIC.txt content
['line vty\nexit\n',
'frr defaults datacenter\n',
'log syslog informational\n',
'router ospf\nexit\n',
'router ospf\n ospf router-id 172.16.0.159\nexit\n',
'interface dummy_1234\nexit\n',
'interface dummy_1234\n ip ospf area 1234\nexit\n',
'interface dummy_1234\n ip ospf passive\nexit\n',
'interface ens19\nexit\n',
'interface ens19\n ip ospf area 1234\nexit\n',
'interface ens20\nexit\n',
'interface ens20\n ip ospf area 1234\nexit\n',
'access-list ospf_1234_ips permit 172.16.0.0/24\n',
'route-map ospf permit 100\nexit\n',
'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
'route-map ospf permit 100\n set src 172.16.0.159\nexit\n',
'ip protocol ospf route-map ospf\n',
'line vty\nexit\n']
[1692|mgmtd] sending configuration
[1693|zebra] sending configuration
[1696|ospfd] sending configuration
[1699|bgpd] sending configuration
[1693|zebra] done
[1707|watchfrr] sending configuration
[1709|staticd] sending configuration
[1710|bfdd] sending configuration
Waiting for children to finish applying config...
[1707|watchfrr] done
[1696|ospfd] done
MGMTD: No changes found to be committed!
[1692|mgmtd] done
[1709|staticd] done
[1699|bgpd] done
[1710|bfdd] done
TASK OK
fabric160:
2025-04-03 09:30:09,972 INFO: Called via "Namespace(input=None, reload=True, test=False, debug=False, log_level='info', stdout=True, pathspace=None, filename='/etc/frr/frr.conf', overwrite=False, bindir='/usr/bin', confdir='/etc/frr', rundir='/var/run/frr', vty_socket=None, daemon='', test_reset=False)"
2025-04-03 09:30:09,972 INFO: Loading Config object from file /etc/frr/frr.conf
2025-04-03 09:30:09,985 INFO: Loading Config object from vtysh show running
2025-04-03 09:30:09,992 INFO: "frr defaults traditional" cannot be removed
2025-04-03 09:30:09,998 INFO: Executed "ip forwarding"
2025-04-03 09:30:10,004 INFO: Executed "ipv6 forwarding"
2025-04-03 09:30:10,004 INFO: /var/run/frr/reload-5ATLT2.txt content
['frr defaults datacenter\n',
'log syslog informational\n',
'router ospf\nexit\n',
'router ospf\n ospf router-id 172.16.0.160\nexit\n',
'interface dummy_1234\nexit\n',
'interface dummy_1234\n ip ospf area 1234\nexit\n',
'interface dummy_1234\n ip ospf passive\nexit\n',
'interface ens19\nexit\n',
'interface ens19\n ip ospf area 1234\nexit\n',
'interface ens20\nexit\n',
'interface ens20\n ip ospf area 1234\nexit\n',
'access-list ospf_1234_ips permit 172.16.0.0/24\n',
'route-map ospf permit 100\nexit\n',
'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
'route-map ospf permit 100\n set src 172.16.0.160\nexit\n',
'ip protocol ospf route-map ospf\n',
'line vty\nexit\n']
[1699|mgmtd] sending configuration
[1700|zebra] sending configuration
[1703|ospfd] sending configuration
[1706|bgpd] sending configuration
[1700|zebra] done
[1714|watchfrr] sending configuration
[1716|staticd] sending configuration
[1717|bfdd] sending configuration
Waiting for children to finish applying config...
[1714|watchfrr] done
[1716|staticd] done
[1706|bgpd] done
[1717|bfdd] done
[1699|mgmtd] done
[1703|ospfd] done
2025-04-03 09:30:10,016 INFO: Loading Config object from vtysh show running
2025-04-03 09:30:10,023 INFO: /var/run/frr/reload-NFS4UM.txt content
['line vty\nexit\n',
'frr defaults datacenter\n',
'log syslog informational\n',
'router ospf\nexit\n',
'router ospf\n ospf router-id 172.16.0.160\nexit\n',
'interface dummy_1234\nexit\n',
'interface dummy_1234\n ip ospf area 1234\nexit\n',
'interface dummy_1234\n ip ospf passive\nexit\n',
'interface ens19\nexit\n',
'interface ens19\n ip ospf area 1234\nexit\n',
'interface ens20\nexit\n',
'interface ens20\n ip ospf area 1234\nexit\n',
'access-list ospf_1234_ips permit 172.16.0.0/24\n',
'route-map ospf permit 100\nexit\n',
'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
'route-map ospf permit 100\n set src 172.16.0.160\nexit\n',
'ip protocol ospf route-map ospf\n',
'line vty\nexit\n']
[1724|mgmtd] sending configuration
[1725|zebra] sending configuration
[1728|ospfd] sending configuration
[1731|bgpd] sending configuration
[1739|watchfrr] sending configuration
[1725|zebra] done
[1741|staticd] sending configuration
[1742|bfdd] sending configuration
Waiting for children to finish applying config...
[1739|watchfrr] done
[1741|staticd] done
[1728|ospfd] done
[1731|bgpd] done
[1742|bfdd] done
MGMTD: No changes found to be committed!
[1724|mgmtd] done
TASK OK
fabric161:
2025-04-03 09:30:08,321 INFO: Called via "Namespace(input=None, reload=True, test=False, debug=False, log_level='info', stdout=True, pathspace=None, filename='/etc/frr/frr.conf', overwrite=False, bindir='/usr/bin', confdir='/etc/frr', rundir='/var/run/frr', vty_socket=None, daemon='', test_reset=False)"
2025-04-03 09:30:08,321 INFO: Loading Config object from file /etc/frr/frr.conf
2025-04-03 09:30:08,334 INFO: Loading Config object from vtysh show running
2025-04-03 09:30:08,342 INFO: "frr defaults traditional" cannot be removed
2025-04-03 09:30:08,348 INFO: Executed "ip forwarding"
2025-04-03 09:30:08,354 INFO: Executed "ipv6 forwarding"
2025-04-03 09:30:08,354 INFO: /var/run/frr/reload-PVFBCH.txt content
['frr defaults datacenter\n',
'log syslog informational\n',
'router ospf\nexit\n',
'router ospf\n ospf router-id 172.16.0.161\nexit\n',
'interface dummy_1234\nexit\n',
'interface dummy_1234\n ip ospf area 1234\nexit\n',
'interface dummy_1234\n ip ospf passive\nexit\n',
'interface ens19\nexit\n',
'interface ens19\n ip ospf area 1234\nexit\n',
'interface ens20\nexit\n',
'interface ens20\n ip ospf area 1234\nexit\n',
'access-list ospf_1234_ips permit 172.16.0.0/24\n',
'route-map ospf permit 100\nexit\n',
'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
'route-map ospf permit 100\n set src 172.16.0.161\nexit\n',
'ip protocol ospf route-map ospf\n',
'line vty\nexit\n']
[1671|mgmtd] sending configuration
[1672|zebra] sending configuration
[1675|ospfd] sending configuration
[1678|bgpd] sending configuration
[1686|watchfrr] sending configuration
[1688|staticd] sending configuration
[1672|zebra] done
[1689|bfdd] sending configuration
Waiting for children to finish applying config...
[1688|staticd] done
[1686|watchfrr] done
[1689|bfdd] done
[1678|bgpd] done
[1671|mgmtd] done
[1675|ospfd] done
2025-04-03 09:30:08,367 INFO: Loading Config object from vtysh show running
2025-04-03 09:30:08,374 INFO: /var/run/frr/reload-SKOSWJ.txt content
['line vty\nexit\n',
'frr defaults datacenter\n',
'log syslog informational\n',
'router ospf\nexit\n',
'router ospf\n ospf router-id 172.16.0.161\nexit\n',
'interface dummy_1234\nexit\n',
'interface dummy_1234\n ip ospf area 1234\nexit\n',
'interface dummy_1234\n ip ospf passive\nexit\n',
'interface ens19\nexit\n',
'interface ens19\n ip ospf area 1234\nexit\n',
'interface ens20\nexit\n',
'interface ens20\n ip ospf area 1234\nexit\n',
'access-list ospf_1234_ips permit 172.16.0.0/24\n',
'route-map ospf permit 100\nexit\n',
'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
'route-map ospf permit 100\n set src 172.16.0.161\nexit\n',
'ip protocol ospf route-map ospf\n',
'line vty\nexit\n']
[1696|mgmtd] sending configuration
[1697|zebra] sending configuration
[1700|ospfd] sending configuration
[1703|bgpd] sending configuration
[1697|zebra] done
[1711|watchfrr] sending configuration
[1713|staticd] sending configuration
Waiting for children to finish applying config...
[1714|bfdd] sending configuration
[1711|watchfrr] done
[1713|staticd] done
[1714|bfdd] done
[1700|ospfd] done
[1703|bgpd] done
MGMTD: No changes found to be committed!
[1696|mgmtd] done
TASK OK
# cat /etc/pve/sdn/fabrics/ospf.cfg
fabric: 1234
loopback_prefix 172.16.0.0/24
node: 1234_fabric159
interface name=ens19,ip=172.31.0.159/24
interface name=ens20,ip=172.31.2.159/24
router_id 172.16.0.159
node: 1234_fabric160
interface name=ens19,ip=172.31.0.160/24
interface name=ens20,ip=172.31.1.160/24
router_id 172.16.0.160
node: 1234_fabric161
interface name=ens19,ip=172.31.1.161/24
interface name=ens20,ip=172.31.2.161/24
router_id 172.16.0.161
[2]
# cat /etc/pve/sdn/fabrics/openfabric.cfg
fabric: fabric
hello_interval 2
loopback_prefix 172.16.0.0/24
node: fabric_fabric159
interface name=ens19,ip=172.31.0.159/24
interface name=ens20,ip=172.31.2.159/24
router_id 172.16.0.159
node: fabric_fabric160
interface name=ens19,ip=172.31.0.160/24
interface name=ens20,ip=172.31.1.160/24
router_id 172.16.0.160
node: fabric_fabric161
interface name=ens19,ip=172.31.1.161/24
interface name=ens20,ip=172.31.2.161/24
router_id 172.16.0.161
[3] https://pve.proxmox.com/wiki/Full_Mesh_Network_for_Ceph_Server#Routed_Setup_(with_Fallback)
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-03 8:30 ` [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Friedrich Weber
@ 2025-04-03 10:21 ` Gabriel Goller
2025-04-03 13:44 ` Friedrich Weber
0 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-04-03 10:21 UTC (permalink / raw)
To: Friedrich Weber; +Cc: Proxmox VE development discussion
On 03.04.2025 10:30, Friedrich Weber wrote:
>On 28/03/2025 18:12, Gabriel Goller wrote:
>> This series allows the user to add fabrics such as OpenFabric and OSPF over
>> their clusters.
>>
>> Overview
>> ========
>>
>> This series allows the user to create routed networks ('fabrics') across their
>> clusters, which can be used as the underlay network for a EVPN cluster, or for
>> creating Ceph full mesh clusters easily.
>>
>> This patch series adds the initial support for two routing protocols:
>> * OpenFabric
>> * OSPF
>
>I tested a bit with packages provided Gabriel built for me (thanks!),
>both OSPF and OpenFabric, and also set up a Ceph full mesh over OpenFabric.
>Overall it looked quite smooth! I didn't notice huge issues, but have
>some minor points below:
>
>- I think the error message when frr+frr-pythontools is not installed
>looked a bit scary. It's on me for not reading the docs, but still,
>might be nice to have a friendlier error message in that case :)
Umm which message exactly do you mean? If I uninstall frr and
frr-pythontools, I get:
WARN: missing /usr/lib/frr/frr-reload.py. Please install frr-pythontools package
which IMO is quite ok.
>- having already added one node, and then adding another using the "Add
>Node" dialog, it has happened multiple times that I kept "Node" at the
>default first node (which I already had defined) while I thought I was
>configuring the second one, and only noticed when I submitted and got
>"node already exists". And then, when I change the "Node" to the correct
>one, I lost my form input :) I understand that we need to reload when
>changing "Node" (the other node might have other interfaces), but to
>avoid the above, maybe the dialog could preselect a node that is not yet
>defined?
Yep, this is already on our todo-list. Should be as simple as passing
an array of already configured nodes down to the NodeEdit component and
then disallow them in the pveNodeSelector using 'disallowNodes'.
>- when removing a fabric, the IP addresses defined on the interfaces
>remain until the next reboot. I guess the reason is that ifupdown2
>doesn't remove IP addresses when the corresponding stanza vanishes. Not
>sure if this can be easily fixed -- if not, maybe this would be worth a
>note in the docs?
Umm, I think `ifreload -a` should remove all the addresses? At least it
works on my machine :)
But I'll check again.
>- when removing the only fabric and applying, the srvreload task has a
>couple of spurious error messages:
>
>> 2025-04-03 09:35:59,354 ^[[91m ERROR^[[0m: Filename /etc/frr/frr.conf is an empty file
>> frr reload command fail: command '/usr/lib/frr/frr-reload.py --stdout --reload /etc/frr/frr.conf' failed: exit code 1
>> Restarting frr. at /usr/share/perl5/PVE/Network/SDN/Frr.pm line 74.
>> TASK OK
Hmm I guess we could check if the file is empty before reloading? That
should probably work.
>- regarding the hello/csnp intervals: it would be nice to mention what the
>default values are. Also, probably not relevant for this patch series, but
>wanted to mention anyway: For running a Ceph full mesh over a fabric,
>one probably wants to set relatively low values here (as our wiki guide
>does [3])? If there is a guide in the future for setting up Ceph full mesh
>over fabric, would be nice if the guide would mention that.
Yep, fixed this. Added the default values in the docs for v2.
>- I'm not so sure about this, but maybe it would be nice to show the
>default-hidden hello/csnp interval columns if I have entered a value
>there?
This should be possible.
>- when I remove hello interval+multiplier and the csnp via the GUI, I get
>the following warning in the journal:
>
>> Apr 03 10:20:50 fabric159 pveproxy[9244]: Use of uninitialized value $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/Network/SDN/Fabrics.pm line 330.
>> Apr 03 10:21:02 fabric159 pveproxy[9246]: Use of uninitialized value $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/Network/SDN/Fabrics.pm line 330.
>> Apr 03 10:21:02 fabric159 pveproxy[9246]: Use of uninitialized value $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/Network/SDN/Fabrics.pm line 330.
I don't think this is related to the hello-interval and multiplier
values. AFAICT this is because of the permissions, which are completely
overhauled in v2.
>- after setting up an OSPF fabric in a 3-node full mesh, I couldn't ping
>the loopback addresses until I rebooted all nodes. I've attached the
>task logs of the srvreloads and the ospf.cfg below [1]. After a reboot,
>the pings work fine. Could it be because an OSPF with the same area
>existed previously?
How long did you wait, sometimes they take a while to converge, usually
ospf more than openfabric. Could also be that some routes are cached/not
removed properly. Could you also paste the frr.conf if you still have
the cluster (`cat /etc/frr/frr.conf`)? Also can you reproduce this? Does
a `systemctl restart frr` fix it as well?
>- probably a user error, but: after setting up an OpenFabric fabric and
>rebooting, the routes didn't come up automatically. My openfabric.cfg is
>in [2]. systemctl status frr shows the following:
>
>> Apr 03 10:02:20 fabric159 systemd[1]: Started frr.service - FRRouting.
>> Apr 03 10:02:21 fabric159 fabricd[699]: [NBV6R-CM3PT] OpenFabric: Needed to resync LSPDB using CSNP!
>> Apr 03 10:03:48 fabric159 fabricd[699]: [QBAZ6-3YZR3] OpenFabric: Could not find two T0 routers
>
>> Apr 03 10:02:23 fabric160 systemd[1]: Started frr.service - FRRouting.
>> Apr 03 10:02:24 fabric160 fabricd[674]: [MZS0T-YRAMC] OpenFabric: Initial synchronization on ens19 complete.
>> Apr 03 10:03:48 fabric160 fabricd[674]: [QBAZ6-3YZR3] OpenFabric: Could not find two T0 routers
>
>> Apr 03 10:02:19 fabric161 systemd[1]: Started frr.service - FRRouting.
>> Apr 03 10:02:21 fabric161 fabricd[681]: [MZS0T-YRAMC] OpenFabric: Initial synchronization on ens20 complete.
>> Apr 03 10:03:48 fabric161 fabricd[681]: [QBAZ6-3YZR3] OpenFabric: Could not find two T0 routers
>
>Maybe I'm just too impatient, but estarting frr and waiting for ~30 seconds fixes it.
Yeah, as I said sometimes converging takes a while, especially when
older routes are around. The logs are just warnings that this isn't a
proper "spine-leaf" topo and the isis tier couldn't be determined—this
shouldn't change anything though.
Will look into it though.
Thanks for reviewing!
>
>[1]
>
>fabric159:
>
>2025-04-03 09:30:06,673 INFO: Called via "Namespace(input=None, reload=True, test=False, debug=False, log_level='info', stdout=True, pathspace=None, filename='/etc/frr/frr.conf', overwrite=False, bindir='/usr/bin', confdir='/etc/frr', rundir='/var/run/frr', vty_socket=None, daemon='', test_reset=False)"
>2025-04-03 09:30:06,673 INFO: Loading Config object from file /etc/frr/frr.conf
>2025-04-03 09:30:06,690 INFO: Loading Config object from vtysh show running
>2025-04-03 09:30:06,697 INFO: "frr defaults traditional" cannot be removed
>2025-04-03 09:30:06,703 INFO: Executed "ip forwarding"
>2025-04-03 09:30:06,709 INFO: Executed "ipv6 forwarding"
>2025-04-03 09:30:06,709 INFO: /var/run/frr/reload-B14N3D.txt content
>['frr defaults datacenter\n',
> 'log syslog informational\n',
> 'router ospf\nexit\n',
> 'router ospf\n ospf router-id 172.16.0.159\nexit\n',
> 'interface dummy_1234\nexit\n',
> 'interface dummy_1234\n ip ospf area 1234\nexit\n',
> 'interface dummy_1234\n ip ospf passive\nexit\n',
> 'interface ens19\nexit\n',
> 'interface ens19\n ip ospf area 1234\nexit\n',
> 'interface ens20\nexit\n',
> 'interface ens20\n ip ospf area 1234\nexit\n',
> 'access-list ospf_1234_ips permit 172.16.0.0/24\n',
> 'route-map ospf permit 100\nexit\n',
> 'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
> 'route-map ospf permit 100\n set src 172.16.0.159\nexit\n',
> 'ip protocol ospf route-map ospf\n',
> 'line vty\nexit\n']
>[1667|mgmtd] sending configuration
>[1668|zebra] sending configuration
>[1671|ospfd] sending configuration
>[1674|bgpd] sending configuration
>[1668|zebra] done
>[1682|watchfrr] sending configuration
>[1684|staticd] sending configuration
>[1685|bfdd] sending configuration
>Waiting for children to finish applying config...
>[1682|watchfrr] done
>[1674|bgpd] done
>[1684|staticd] done
>[1685|bfdd] done
>[1667|mgmtd] done
>[1671|ospfd] done
>2025-04-03 09:30:06,721 INFO: Loading Config object from vtysh show running
>2025-04-03 09:30:06,729 INFO: /var/run/frr/reload-UJJQIC.txt content
>['line vty\nexit\n',
> 'frr defaults datacenter\n',
> 'log syslog informational\n',
> 'router ospf\nexit\n',
> 'router ospf\n ospf router-id 172.16.0.159\nexit\n',
> 'interface dummy_1234\nexit\n',
> 'interface dummy_1234\n ip ospf area 1234\nexit\n',
> 'interface dummy_1234\n ip ospf passive\nexit\n',
> 'interface ens19\nexit\n',
> 'interface ens19\n ip ospf area 1234\nexit\n',
> 'interface ens20\nexit\n',
> 'interface ens20\n ip ospf area 1234\nexit\n',
> 'access-list ospf_1234_ips permit 172.16.0.0/24\n',
> 'route-map ospf permit 100\nexit\n',
> 'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
> 'route-map ospf permit 100\n set src 172.16.0.159\nexit\n',
> 'ip protocol ospf route-map ospf\n',
> 'line vty\nexit\n']
>[1692|mgmtd] sending configuration
>[1693|zebra] sending configuration
>[1696|ospfd] sending configuration
>[1699|bgpd] sending configuration
>[1693|zebra] done
>[1707|watchfrr] sending configuration
>[1709|staticd] sending configuration
>[1710|bfdd] sending configuration
>Waiting for children to finish applying config...
>[1707|watchfrr] done
>[1696|ospfd] done
>MGMTD: No changes found to be committed!
>[1692|mgmtd] done
>[1709|staticd] done
>[1699|bgpd] done
>[1710|bfdd] done
>TASK OK
>
>fabric160:
>
>2025-04-03 09:30:09,972 INFO: Called via "Namespace(input=None, reload=True, test=False, debug=False, log_level='info', stdout=True, pathspace=None, filename='/etc/frr/frr.conf', overwrite=False, bindir='/usr/bin', confdir='/etc/frr', rundir='/var/run/frr', vty_socket=None, daemon='', test_reset=False)"
>2025-04-03 09:30:09,972 INFO: Loading Config object from file /etc/frr/frr.conf
>2025-04-03 09:30:09,985 INFO: Loading Config object from vtysh show running
>2025-04-03 09:30:09,992 INFO: "frr defaults traditional" cannot be removed
>2025-04-03 09:30:09,998 INFO: Executed "ip forwarding"
>2025-04-03 09:30:10,004 INFO: Executed "ipv6 forwarding"
>2025-04-03 09:30:10,004 INFO: /var/run/frr/reload-5ATLT2.txt content
>['frr defaults datacenter\n',
> 'log syslog informational\n',
> 'router ospf\nexit\n',
> 'router ospf\n ospf router-id 172.16.0.160\nexit\n',
> 'interface dummy_1234\nexit\n',
> 'interface dummy_1234\n ip ospf area 1234\nexit\n',
> 'interface dummy_1234\n ip ospf passive\nexit\n',
> 'interface ens19\nexit\n',
> 'interface ens19\n ip ospf area 1234\nexit\n',
> 'interface ens20\nexit\n',
> 'interface ens20\n ip ospf area 1234\nexit\n',
> 'access-list ospf_1234_ips permit 172.16.0.0/24\n',
> 'route-map ospf permit 100\nexit\n',
> 'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
> 'route-map ospf permit 100\n set src 172.16.0.160\nexit\n',
> 'ip protocol ospf route-map ospf\n',
> 'line vty\nexit\n']
>[1699|mgmtd] sending configuration
>[1700|zebra] sending configuration
>[1703|ospfd] sending configuration
>[1706|bgpd] sending configuration
>[1700|zebra] done
>[1714|watchfrr] sending configuration
>[1716|staticd] sending configuration
>[1717|bfdd] sending configuration
>Waiting for children to finish applying config...
>[1714|watchfrr] done
>[1716|staticd] done
>[1706|bgpd] done
>[1717|bfdd] done
>[1699|mgmtd] done
>[1703|ospfd] done
>2025-04-03 09:30:10,016 INFO: Loading Config object from vtysh show running
>2025-04-03 09:30:10,023 INFO: /var/run/frr/reload-NFS4UM.txt content
>['line vty\nexit\n',
> 'frr defaults datacenter\n',
> 'log syslog informational\n',
> 'router ospf\nexit\n',
> 'router ospf\n ospf router-id 172.16.0.160\nexit\n',
> 'interface dummy_1234\nexit\n',
> 'interface dummy_1234\n ip ospf area 1234\nexit\n',
> 'interface dummy_1234\n ip ospf passive\nexit\n',
> 'interface ens19\nexit\n',
> 'interface ens19\n ip ospf area 1234\nexit\n',
> 'interface ens20\nexit\n',
> 'interface ens20\n ip ospf area 1234\nexit\n',
> 'access-list ospf_1234_ips permit 172.16.0.0/24\n',
> 'route-map ospf permit 100\nexit\n',
> 'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
> 'route-map ospf permit 100\n set src 172.16.0.160\nexit\n',
> 'ip protocol ospf route-map ospf\n',
> 'line vty\nexit\n']
>[1724|mgmtd] sending configuration
>[1725|zebra] sending configuration
>[1728|ospfd] sending configuration
>[1731|bgpd] sending configuration
>[1739|watchfrr] sending configuration
>[1725|zebra] done
>[1741|staticd] sending configuration
>[1742|bfdd] sending configuration
>Waiting for children to finish applying config...
>[1739|watchfrr] done
>[1741|staticd] done
>[1728|ospfd] done
>[1731|bgpd] done
>[1742|bfdd] done
>MGMTD: No changes found to be committed!
>[1724|mgmtd] done
>TASK OK
>
>fabric161:
>
>2025-04-03 09:30:08,321 INFO: Called via "Namespace(input=None, reload=True, test=False, debug=False, log_level='info', stdout=True, pathspace=None, filename='/etc/frr/frr.conf', overwrite=False, bindir='/usr/bin', confdir='/etc/frr', rundir='/var/run/frr', vty_socket=None, daemon='', test_reset=False)"
>2025-04-03 09:30:08,321 INFO: Loading Config object from file /etc/frr/frr.conf
>2025-04-03 09:30:08,334 INFO: Loading Config object from vtysh show running
>2025-04-03 09:30:08,342 INFO: "frr defaults traditional" cannot be removed
>2025-04-03 09:30:08,348 INFO: Executed "ip forwarding"
>2025-04-03 09:30:08,354 INFO: Executed "ipv6 forwarding"
>2025-04-03 09:30:08,354 INFO: /var/run/frr/reload-PVFBCH.txt content
>['frr defaults datacenter\n',
> 'log syslog informational\n',
> 'router ospf\nexit\n',
> 'router ospf\n ospf router-id 172.16.0.161\nexit\n',
> 'interface dummy_1234\nexit\n',
> 'interface dummy_1234\n ip ospf area 1234\nexit\n',
> 'interface dummy_1234\n ip ospf passive\nexit\n',
> 'interface ens19\nexit\n',
> 'interface ens19\n ip ospf area 1234\nexit\n',
> 'interface ens20\nexit\n',
> 'interface ens20\n ip ospf area 1234\nexit\n',
> 'access-list ospf_1234_ips permit 172.16.0.0/24\n',
> 'route-map ospf permit 100\nexit\n',
> 'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
> 'route-map ospf permit 100\n set src 172.16.0.161\nexit\n',
> 'ip protocol ospf route-map ospf\n',
> 'line vty\nexit\n']
>[1671|mgmtd] sending configuration
>[1672|zebra] sending configuration
>[1675|ospfd] sending configuration
>[1678|bgpd] sending configuration
>[1686|watchfrr] sending configuration
>[1688|staticd] sending configuration
>[1672|zebra] done
>[1689|bfdd] sending configuration
>Waiting for children to finish applying config...
>[1688|staticd] done
>[1686|watchfrr] done
>[1689|bfdd] done
>[1678|bgpd] done
>[1671|mgmtd] done
>[1675|ospfd] done
>2025-04-03 09:30:08,367 INFO: Loading Config object from vtysh show running
>2025-04-03 09:30:08,374 INFO: /var/run/frr/reload-SKOSWJ.txt content
>['line vty\nexit\n',
> 'frr defaults datacenter\n',
> 'log syslog informational\n',
> 'router ospf\nexit\n',
> 'router ospf\n ospf router-id 172.16.0.161\nexit\n',
> 'interface dummy_1234\nexit\n',
> 'interface dummy_1234\n ip ospf area 1234\nexit\n',
> 'interface dummy_1234\n ip ospf passive\nexit\n',
> 'interface ens19\nexit\n',
> 'interface ens19\n ip ospf area 1234\nexit\n',
> 'interface ens20\nexit\n',
> 'interface ens20\n ip ospf area 1234\nexit\n',
> 'access-list ospf_1234_ips permit 172.16.0.0/24\n',
> 'route-map ospf permit 100\nexit\n',
> 'route-map ospf permit 100\n match ip address ospf_1234_ips\nexit\n',
> 'route-map ospf permit 100\n set src 172.16.0.161\nexit\n',
> 'ip protocol ospf route-map ospf\n',
> 'line vty\nexit\n']
>[1696|mgmtd] sending configuration
>[1697|zebra] sending configuration
>[1700|ospfd] sending configuration
>[1703|bgpd] sending configuration
>[1697|zebra] done
>[1711|watchfrr] sending configuration
>[1713|staticd] sending configuration
>Waiting for children to finish applying config...
>[1714|bfdd] sending configuration
>[1711|watchfrr] done
>[1713|staticd] done
>[1714|bfdd] done
>[1700|ospfd] done
>[1703|bgpd] done
>MGMTD: No changes found to be committed!
>[1696|mgmtd] done
>TASK OK
>
># cat /etc/pve/sdn/fabrics/ospf.cfg
>fabric: 1234
> loopback_prefix 172.16.0.0/24
>
>node: 1234_fabric159
> interface name=ens19,ip=172.31.0.159/24
> interface name=ens20,ip=172.31.2.159/24
> router_id 172.16.0.159
>
>node: 1234_fabric160
> interface name=ens19,ip=172.31.0.160/24
> interface name=ens20,ip=172.31.1.160/24
> router_id 172.16.0.160
>
>node: 1234_fabric161
> interface name=ens19,ip=172.31.1.161/24
> interface name=ens20,ip=172.31.2.161/24
> router_id 172.16.0.161
>
>[2]
>
># cat /etc/pve/sdn/fabrics/openfabric.cfg
>fabric: fabric
> hello_interval 2
> loopback_prefix 172.16.0.0/24
>
>node: fabric_fabric159
> interface name=ens19,ip=172.31.0.159/24
> interface name=ens20,ip=172.31.2.159/24
> router_id 172.16.0.159
>
>node: fabric_fabric160
> interface name=ens19,ip=172.31.0.160/24
> interface name=ens20,ip=172.31.1.160/24
> router_id 172.16.0.160
>
>node: fabric_fabric161
> interface name=ens19,ip=172.31.1.161/24
> interface name=ens20,ip=172.31.2.161/24
> router_id 172.16.0.161
>
>[3] https://pve.proxmox.com/wiki/Full_Mesh_Network_for_Ceph_Server#Routed_Setup_(with_Fallback)
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-03 10:21 ` Gabriel Goller
@ 2025-04-03 13:44 ` Friedrich Weber
2025-04-03 14:03 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Friedrich Weber @ 2025-04-03 13:44 UTC (permalink / raw)
To: Proxmox VE development discussion, Gabriel Goller
On 03/04/2025 12:21, Gabriel Goller wrote:
> On 03.04.2025 10:30, Friedrich Weber wrote:
>> On 28/03/2025 18:12, Gabriel Goller wrote:
>>> This series allows the user to add fabrics such as OpenFabric and
>>> OSPF over
>>> their clusters.
>>>
>>> Overview
>>> ========
>>>
>>> This series allows the user to create routed networks ('fabrics')
>>> across their
>>> clusters, which can be used as the underlay network for a EVPN
>>> cluster, or for
>>> creating Ceph full mesh clusters easily.
>>>
>>> This patch series adds the initial support for two routing protocols:
>>> * OpenFabric
>>> * OSPF
>>
>> I tested a bit with packages provided Gabriel built for me (thanks!),
>> both OSPF and OpenFabric, and also set up a Ceph full mesh over
>> OpenFabric.
>> Overall it looked quite smooth! I didn't notice huge issues, but have
>> some minor points below:
>>
>> - I think the error message when frr+frr-pythontools is not installed
>> looked a bit scary. It's on me for not reading the docs, but still,
>> might be nice to have a friendlier error message in that case :)
>
> Umm which message exactly do you mean? If I uninstall frr and
> frr-pythontools, I get:
>
> WARN: missing /usr/lib/frr/frr-reload.py. Please install frr-
> pythontools package
On a fresh installation without frr + frr-pythontools, I get the
following on srvreload:
> TASK ERROR: can't open '/etc/frr/daemons' - No such file or directory
Same if I `apt purge frr frr-pythontools` -- I guess because this one
actually removes /etc/frr.
Admittedly that's not very scary after all and somewhat
self-explanatory, but still not as nice as the error message you quote.
>> - having already added one node, and then adding another using the "Add
>> Node" dialog, it has happened multiple times that I kept "Node" at the
>> default first node (which I already had defined) while I thought I was
>> configuring the second one, and only noticed when I submitted and got
>> "node already exists". And then, when I change the "Node" to the correct
>> one, I lost my form input :) I understand that we need to reload when
>> changing "Node" (the other node might have other interfaces), but to
>> avoid the above, maybe the dialog could preselect a node that is not yet
>> defined?
>
> Yep, this is already on our todo-list. Should be as simple as passing
> an array of already configured nodes down to the NodeEdit component and
> then disallow them in the pveNodeSelector using 'disallowNodes'.
OK, thanks :)
>> - when removing a fabric, the IP addresses defined on the interfaces
>> remain until the next reboot. I guess the reason is that ifupdown2
>> doesn't remove IP addresses when the corresponding stanza vanishes. Not
>> sure if this can be easily fixed -- if not, maybe this would be worth a
>> note in the docs?
>
> Umm, I think `ifreload -a` should remove all the addresses? At least it
> works on my machine :)
>
> But I'll check again.
I took a closer look -- seems I can only reproduce this if
/etc/network/interfaces contains an empty `iface INTERFACE inet manual`
stanza for the interface. Without such a stanza, the IP address is
removed correctly.
>> - regarding the hello/csnp intervals: it would be nice to mention what
>> the
>> default values are. Also, probably not relevant for this patch series,
>> but
>> wanted to mention anyway: For running a Ceph full mesh over a fabric,
>> one probably wants to set relatively low values here (as our wiki guide
>> does [3])? If there is a guide in the future for setting up Ceph full
>> mesh
>> over fabric, would be nice if the guide would mention that.
>
> Yep, fixed this. Added the default values in the docs for v2.
Thanks!
>> - when I remove hello interval+multiplier and the csnp via the GUI, I get
>> the following warning in the journal:
>>
>>> Apr 03 10:20:50 fabric159 pveproxy[9244]: Use of uninitialized value
>>> $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/
>>> Network/SDN/Fabrics.pm line 330.
>>> Apr 03 10:21:02 fabric159 pveproxy[9246]: Use of uninitialized value
>>> $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/
>>> Network/SDN/Fabrics.pm line 330.
>>> Apr 03 10:21:02 fabric159 pveproxy[9246]: Use of uninitialized value
>>> $id in concatenation (.) or string at /usr/share/perl5/PVE/API2/
>>> Network/SDN/Fabrics.pm line 330.
>
> I don't think this is related to the hello-interval and multiplier
> values. AFAICT this is because of the permissions, which are completely
> overhauled in v2.
OK, I see -- I can try to test this again in v2.
>> - after setting up an OSPF fabric in a 3-node full mesh, I couldn't ping
>> the loopback addresses until I rebooted all nodes. I've attached the
>> task logs of the srvreloads and the ospf.cfg below [1]. After a reboot,
>> the pings work fine. Could it be because an OSPF with the same area
>> existed previously?
>
> How long did you wait, sometimes they take a while to converge, usually
> ospf more than openfabric. Could also be that some routes are cached/not
> removed properly. Could you also paste the frr.conf if you still have
> the cluster (`cat /etc/frr/frr.conf`)? Also can you reproduce this? Does
> a `systemctl restart frr` fix it as well?
I just tried it again and it seems to be reproducible: Set up OSPF on a
fresh full-mesh 3-node cluster, waited 10 minutes after the srvreload,
the routes didn't come up. I've attached the frr.conf's [1].
After systemctl restart frr, the routes came up in a minute.
I also have a snapshot of the cluster pre-reboot, if you want to take a
look at it.
>> - probably a user error, but: after setting up an OpenFabric fabric and
>> rebooting, the routes didn't come up automatically. My openfabric.cfg is
>> in [2]. systemctl status frr shows the following:
>>
>>> Apr 03 10:02:20 fabric159 systemd[1]: Started frr.service - FRRouting.
>>> Apr 03 10:02:21 fabric159 fabricd[699]: [NBV6R-CM3PT] OpenFabric:
>>> Needed to resync LSPDB using CSNP!
>>> Apr 03 10:03:48 fabric159 fabricd[699]: [QBAZ6-3YZR3] OpenFabric:
>>> Could not find two T0 routers
>>
>>> Apr 03 10:02:23 fabric160 systemd[1]: Started frr.service - FRRouting.
>>> Apr 03 10:02:24 fabric160 fabricd[674]: [MZS0T-YRAMC] OpenFabric:
>>> Initial synchronization on ens19 complete.
>>> Apr 03 10:03:48 fabric160 fabricd[674]: [QBAZ6-3YZR3] OpenFabric:
>>> Could not find two T0 routers
>>
>>> Apr 03 10:02:19 fabric161 systemd[1]: Started frr.service - FRRouting.
>>> Apr 03 10:02:21 fabric161 fabricd[681]: [MZS0T-YRAMC] OpenFabric:
>>> Initial synchronization on ens20 complete.
>>> Apr 03 10:03:48 fabric161 fabricd[681]: [QBAZ6-3YZR3] OpenFabric:
>>> Could not find two T0 routers
>>
>> Maybe I'm just too impatient, but estarting frr and waiting for ~30
>> seconds fixes it.
>
> Yeah, as I said sometimes converging takes a while, especially when
> older routes are around. The logs are just warnings that this isn't a
> proper "spine-leaf" topo and the isis tier couldn't be determined—this
> shouldn't change anything though.
>
> Will look into it though.
>
OK -- let me know if I should test this again.
One more thing I just noticed now: After installing the packages, it
seems like the directory /etc/pve/sdn/fabrics isn't created and creating
a new fabric in the GUI fails with
> add sdn fabric failed: unable to open file
'/etc/pve/sdn/fabrics/ospf.cfg.tmp.9220' - No such file or directory (500)
But a manual `systemctl restart pveproxy pvedaemon` seems to create it.
[1]
frr.conf on fabric159:
frr version 10.2.1
frr defaults datacenter
hostname fabric159
log syslog informational
service integrated-vtysh-config
!
router ospf
ospf router-id 172.16.0.159
exit
!
interface dummy_12345
ip ospf area 12345
ip ospf passive
exit
!
interface ens19
ip ospf area 12345
exit
!
interface ens20
ip ospf area 12345
exit
!
access-list ospf_12345_ips permit 172.16.0.0/24
!
route-map ospf permit 100
match ip address ospf_12345_ips
set src 172.16.0.159
exit
!
ip protocol ospf route-map ospf
!
line vty
frr.conf on fabric160:
frr version 10.2.1
frr defaults datacenter
hostname fabric160
log syslog informational
service integrated-vtysh-config
!
router ospf
ospf router-id 172.16.0.160
exit
!
interface dummy_12345
ip ospf area 12345
ip ospf passive
exit
!
interface ens19
ip ospf area 12345
exit
!
interface ens20
ip ospf area 12345
exit
!
access-list ospf_12345_ips permit 172.16.0.0/24
!
route-map ospf permit 100
match ip address ospf_12345_ips
set src 172.16.0.160
exit
!
ip protocol ospf route-map ospf
!
line vty
frr.conf on fabric161:
frr version 10.2.1
frr defaults datacenter
hostname fabric161
log syslog informational
service integrated-vtysh-config
!
router ospf
ospf router-id 172.16.0.161
exit
!
interface dummy_12345
ip ospf area 12345
ip ospf passive
exit
!
interface ens19
ip ospf area 12345
exit
!
interface ens20
ip ospf area 12345
exit
!
access-list ospf_12345_ips permit 172.16.0.0/24
!
route-map ospf permit 100
match ip address ospf_12345_ips
set src 172.16.0.161
exit
!
ip protocol ospf route-map ospf
!
line vty
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-03 13:44 ` Friedrich Weber
@ 2025-04-03 14:03 ` Stefan Hanreich
2025-04-03 14:20 ` Friedrich Weber
0 siblings, 1 reply; 97+ messages in thread
From: Stefan Hanreich @ 2025-04-03 14:03 UTC (permalink / raw)
To: Proxmox VE development discussion, Friedrich Weber, Gabriel Goller
On 4/3/25 15:44, Friedrich Weber wrote:
>>> - when removing a fabric, the IP addresses defined on the interfaces
>>> remain until the next reboot. I guess the reason is that ifupdown2
>>> doesn't remove IP addresses when the corresponding stanza vanishes. Not
>>> sure if this can be easily fixed -- if not, maybe this would be worth a
>>> note in the docs?
>>
>> Umm, I think `ifreload -a` should remove all the addresses? At least it
>> works on my machine :)
>>
>> But I'll check again.
>
> I took a closer look -- seems I can only reproduce this if
> /etc/network/interfaces contains an empty `iface INTERFACE inet manual`
> stanza for the interface. Without such a stanza, the IP address is
> removed correctly.
`manual` means, that IP addresses are configured manually by the user,
so if ifupdown2 encounters an address configured on that interface it
won't remove it, since you're telling it with manual that it isn't
responsible for managing addresses on that interface. So I'd say that's
expected with that line?
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-03 14:03 ` Stefan Hanreich
@ 2025-04-03 14:20 ` Friedrich Weber
2025-04-04 7:53 ` Stefan Hanreich
0 siblings, 1 reply; 97+ messages in thread
From: Friedrich Weber @ 2025-04-03 14:20 UTC (permalink / raw)
To: Stefan Hanreich, Proxmox VE development discussion, Gabriel Goller
On 03/04/2025 16:03, Stefan Hanreich wrote:
>
>
> On 4/3/25 15:44, Friedrich Weber wrote:
>>>> - when removing a fabric, the IP addresses defined on the interfaces
>>>> remain until the next reboot. I guess the reason is that ifupdown2
>>>> doesn't remove IP addresses when the corresponding stanza vanishes. Not
>>>> sure if this can be easily fixed -- if not, maybe this would be worth a
>>>> note in the docs?
>>>
>>> Umm, I think `ifreload -a` should remove all the addresses? At least it
>>> works on my machine :)
>>>
>>> But I'll check again.
>>
>> I took a closer look -- seems I can only reproduce this if
>> /etc/network/interfaces contains an empty `iface INTERFACE inet manual`
>> stanza for the interface. Without such a stanza, the IP address is
>> removed correctly.
>
> `manual` means, that IP addresses are configured manually by the user,
> so if ifupdown2 encounters an address configured on that interface it
> won't remove it, since you're telling it with manual that it isn't
> responsible for managing addresses on that interface. So I'd say that's
> expected with that line?
Hmm, the explanation makes sense, but seems like our installer
automatically adds [1] an `iface INTERFACE inet manual` stanza for all
"unused" interfaces? So users may run into this (admittedly minor) issue
if they used interfaces that were already present at installation time
for a fabric, and then remove that fabric.
[1]
https://git.proxmox.com/?p=pve-installer.git;a=blob;f=Proxmox/Install.pm;h=57fd899;hb=95f2bc3ee#l1097
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-03 14:20 ` Friedrich Weber
@ 2025-04-04 7:53 ` Stefan Hanreich
0 siblings, 0 replies; 97+ messages in thread
From: Stefan Hanreich @ 2025-04-04 7:53 UTC (permalink / raw)
To: Friedrich Weber, Proxmox VE development discussion, Gabriel Goller
On 4/3/25 16:20, Friedrich Weber wrote:
> On 03/04/2025 16:03, Stefan Hanreich wrote:
>>
>>
>> On 4/3/25 15:44, Friedrich Weber wrote:
>>>>> - when removing a fabric, the IP addresses defined on the interfaces
>>>>> remain until the next reboot. I guess the reason is that ifupdown2
>>>>> doesn't remove IP addresses when the corresponding stanza vanishes. Not
>>>>> sure if this can be easily fixed -- if not, maybe this would be worth a
>>>>> note in the docs?
>>>>
>>>> Umm, I think `ifreload -a` should remove all the addresses? At least it
>>>> works on my machine :)
>>>>
>>>> But I'll check again.
>>>
>>> I took a closer look -- seems I can only reproduce this if
>>> /etc/network/interfaces contains an empty `iface INTERFACE inet manual`
>>> stanza for the interface. Without such a stanza, the IP address is
>>> removed correctly.
>>
>> `manual` means, that IP addresses are configured manually by the user,
>> so if ifupdown2 encounters an address configured on that interface it
>> won't remove it, since you're telling it with manual that it isn't
>> responsible for managing addresses on that interface. So I'd say that's
>> expected with that line?
>
> Hmm, the explanation makes sense, but seems like our installer
> automatically adds [1] an `iface INTERFACE inet manual` stanza for all
> "unused" interfaces? So users may run into this (admittedly minor) issue
> if they used interfaces that were already present at installation time
> for a fabric, and then remove that fabric.
>
> [1]
> https://git.proxmox.com/?p=pve-installer.git;a=blob;f=Proxmox/Install.pm;h=57fd899;hb=95f2bc3ee#l1097
That's a very valid point - and maybe not even that unlikely in
practice. We should either document this, or find a way around it. I'll
try to think of a solution, but this one is probably a bit tricky to
tackle with how the config generation currently works.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread
* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
` (52 preceding siblings ...)
2025-04-03 8:30 ` [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Friedrich Weber
@ 2025-04-04 10:55 ` Hannes Duerr
2025-04-04 12:48 ` Gabriel Goller
53 siblings, 1 reply; 97+ messages in thread
From: Hannes Duerr @ 2025-04-04 10:55 UTC (permalink / raw)
To: Proxmox VE development discussion, Gabriel Goller
On 3/28/25 18:12, Gabriel Goller wrote:
> This series allows the user to add fabrics such as OpenFabric and OSPF over
> their clusters.
>
> Overview
> ========
>
> This series allows the user to create routed networks ('fabrics') across their
> clusters, which can be used as the underlay network for a EVPN cluster, or for
> creating Ceph full mesh clusters easily.
>
> This patch series adds the initial support for two routing protocols:
> * OpenFabric
> * OSPF
>
> In the future we plan on moving the existing IS-IS and BGP controllers into the
> fabric structure. There are also plans for adding a new Wireguard fabric to
> this.
Very nice feature and from my first impression it works really well!
What I have noticed so far:
1. if you remove interfaces from a node in OSPF you can't add them later
and if you remove the last one you get the following error:
```
Parameter verification failed. (400)
*interfaces*: type check ('array') failed
```
which could be turned into a nicer message or even allowed (why can i
not remove all interfaces for maintenance reasons?).
2. is there a use-case where i do not want to use an interface
`unnumbered` nor with an ip address?
If you also can't think of any i'd suggest restricting it so that the
user has to either tick `unnumbered` or enter an ip address.
I think this would help users starting with OSPF, configuring a node and
wondering why it is not working.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-04 10:55 ` Hannes Duerr
@ 2025-04-04 12:48 ` Gabriel Goller
2025-04-04 12:53 ` Hannes Duerr
0 siblings, 1 reply; 97+ messages in thread
From: Gabriel Goller @ 2025-04-04 12:48 UTC (permalink / raw)
To: Hannes Duerr; +Cc: Proxmox VE development discussion
On 04.04.2025 12:55, Hannes Duerr wrote:
>On 3/28/25 18:12, Gabriel Goller wrote:
>>This series allows the user to add fabrics such as OpenFabric and OSPF over
>>their clusters.
>>
>>Overview
>>========
>>
>>This series allows the user to create routed networks ('fabrics') across their
>>clusters, which can be used as the underlay network for a EVPN cluster, or for
>>creating Ceph full mesh clusters easily.
>>
>>This patch series adds the initial support for two routing protocols:
>>* OpenFabric
>>* OSPF
>>
>>In the future we plan on moving the existing IS-IS and BGP controllers into the
>>fabric structure. There are also plans for adding a new Wireguard fabric to
>>this.
>Very nice feature and from my first impression it works really well!
>What I have noticed so far:
>1. if you remove interfaces from a node in OSPF you can't add them
>later [snip]
Umm this is weird, I couldn't reproduce this... Do you get any error or
does the interface simply vanish. Does editing the node again (new
NodeEdit popup) fix the error or is the interface still gone?
> and if you remove the last one you get the following error:
>
>```
>Parameter verification failed. (400)
>*interfaces*: type check ('array') failed
>```
>which could be turned into a nicer message or even allowed (why can i
>not remove all interfaces for maintenance reasons?).
In v2 we allow Nodes without interfaces, so this error shouldn't be
visible anymore.
>2. is there a use-case where i do not want to use an interface
>`unnumbered` nor with an ip address?
>If you also can't think of any i'd suggest restricting it so that the
>user has to either tick `unnumbered` or enter an ip address.
>I think this would help users starting with OSPF, configuring a node
>and wondering why it is not working.
Yep, I just added this. Now you need to specific either unnumbered or an
ip address and specifying both will also lead to an error!
Thanks for the review!
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-04 12:48 ` Gabriel Goller
@ 2025-04-04 12:53 ` Hannes Duerr
2025-04-04 14:26 ` Gabriel Goller
0 siblings, 1 reply; 97+ messages in thread
From: Hannes Duerr @ 2025-04-04 12:53 UTC (permalink / raw)
To: Proxmox VE development discussion
On 4/4/25 14:48, Gabriel Goller wrote:
> On 04.04.2025 12:55, Hannes Duerr wrote:
>> On 3/28/25 18:12, Gabriel Goller wrote:
>>> This series allows the user to add fabrics such as OpenFabric and
>>> OSPF over
>>> their clusters.
>>>
>>> Overview
>>> ========
>>>
>>> This series allows the user to create routed networks ('fabrics')
>>> across their
>>> clusters, which can be used as the underlay network for a EVPN
>>> cluster, or for
>>> creating Ceph full mesh clusters easily.
>>>
>>> This patch series adds the initial support for two routing protocols:
>>> * OpenFabric
>>> * OSPF
>>>
>>> In the future we plan on moving the existing IS-IS and BGP
>>> controllers into the
>>> fabric structure. There are also plans for adding a new Wireguard
>>> fabric to
>>> this.
>> Very nice feature and from my first impression it works really well!
>> What I have noticed so far:
>> 1. if you remove interfaces from a node in OSPF you can't add them
>> later [snip]
>
> Umm this is weird, I couldn't reproduce this... Do you get any error or
> does the interface simply vanish. Does editing the node again (new
> NodeEdit popup) fix the error or is the interface still gone?
>
The interface is just not shown anymore when i edit the node.
I have to destroy the Node and create it again so see all interfaces again.
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread* Re: [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics
2025-04-04 12:53 ` Hannes Duerr
@ 2025-04-04 14:26 ` Gabriel Goller
0 siblings, 0 replies; 97+ messages in thread
From: Gabriel Goller @ 2025-04-04 14:26 UTC (permalink / raw)
To: Hannes Duerr; +Cc: Proxmox VE development discussion
On 04.04.2025 14:53, Hannes Duerr wrote:
>
>On 4/4/25 14:48, Gabriel Goller wrote:
>>On 04.04.2025 12:55, Hannes Duerr wrote:
>>>On 3/28/25 18:12, Gabriel Goller wrote:
>>>>This series allows the user to add fabrics such as OpenFabric
>>>>and OSPF over
>>>>their clusters.
>>>>
>>>>Overview
>>>>========
>>>>
>>>>This series allows the user to create routed networks
>>>>('fabrics') across their
>>>>clusters, which can be used as the underlay network for a EVPN
>>>>cluster, or for
>>>>creating Ceph full mesh clusters easily.
>>>>
>>>>This patch series adds the initial support for two routing protocols:
>>>>* OpenFabric
>>>>* OSPF
>>>>
>>>>In the future we plan on moving the existing IS-IS and BGP
>>>>controllers into the
>>>>fabric structure. There are also plans for adding a new
>>>>Wireguard fabric to
>>>>this.
>>>Very nice feature and from my first impression it works really well!
>>>What I have noticed so far:
>>>1. if you remove interfaces from a node in OSPF you can't add them
>>>later [snip]
>>
>>Umm this is weird, I couldn't reproduce this... Do you get any error or
>>does the interface simply vanish. Does editing the node again (new
>>NodeEdit popup) fix the error or is the interface still gone?
>>
>The interface is just not shown anymore when i edit the node.
>I have to destroy the Node and create it again so see all interfaces again.
Umm haven't seen it yet...
Myabe v2 fixed it though, will be available later today :)
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
^ permalink raw reply [flat|nested] 97+ messages in thread