Define the protocol-specific properties for OSPF and add the concrete
section types to the Fabric and Node enum. Currently only area is
included, which is also the only property that is required by FRR. We
wanted to start with a minimal set of properties and add any options
later on, depending on feedback from users.
Co-authored-by: Gabriel Goller <g.gol...@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanre...@proxmox.com>
---
.../src/sdn/fabric/section_config/fabric.rs | 23 ++++-
.../src/sdn/fabric/section_config/node.rs | 12 ++-
.../sdn/fabric/section_config/protocol/mod.rs | 1 +
.../fabric/section_config/protocol/ospf.rs | 85 +++++++++++++++++++
4 files changed, 118 insertions(+), 3 deletions(-)
create mode 100644
proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs
b/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs
index 3e56e2b..8ecf725 100644
--- a/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs
+++ b/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs
@@ -7,8 +7,11 @@ use proxmox_schema::{
Updater, UpdaterType,
};
-use crate::sdn::fabric::section_config::protocol::openfabric::{
- OpenfabricDeletableProperties, OpenfabricProperties,
OpenfabricPropertiesUpdater,
+use crate::sdn::fabric::section_config::protocol::{
+ openfabric::{
+ OpenfabricDeletableProperties, OpenfabricProperties,
OpenfabricPropertiesUpdater,
+ },
+ ospf::{OspfDeletableProperties, OspfProperties, OspfPropertiesUpdater},
};
pub const FABRIC_ID_REGEX_STR: &str =
r"(?:[a-zA-Z0-9])(?:[a-zA-Z0-9\-]){0,6}(?:[a-zA-Z0-9])?";
@@ -130,6 +133,10 @@ impl UpdaterType for FabricSection<OpenfabricProperties> {
type Updater = FabricSectionUpdater<OpenfabricPropertiesUpdater,
OpenfabricDeletableProperties>;
}
+impl UpdaterType for FabricSection<OspfProperties> {
+ type Updater = FabricSectionUpdater<OspfPropertiesUpdater,
OspfDeletableProperties>;
+}
+
/// Enum containing all types of fabrics.
///
/// It utilizes [`FabricSection<T>`] to define all possible types of fabrics.
For parsing the
@@ -149,6 +156,7 @@ impl UpdaterType for FabricSection<OpenfabricProperties> {
#[serde(rename_all = "snake_case", tag = "protocol")]
pub enum Fabric {
Openfabric(FabricSection<OpenfabricProperties>),
+ Ospf(FabricSection<OspfProperties>),
}
impl UpdaterType for Fabric {
@@ -162,6 +170,7 @@ impl Fabric {
pub fn id(&self) -> &FabricId {
match self {
Self::Openfabric(fabric_section) => fabric_section.id(),
+ Self::Ospf(fabric_section) => fabric_section.id(),
}
}
@@ -171,6 +180,7 @@ impl Fabric {
pub fn ip_prefix(&self) -> Option<Ipv4Cidr> {
match self {
Fabric::Openfabric(fabric_section) => fabric_section.ip_prefix(),
+ Fabric::Ospf(fabric_section) => fabric_section.ip_prefix(),
}
}
@@ -180,6 +190,7 @@ impl Fabric {
pub fn ip6_prefix(&self) -> Option<Ipv6Cidr> {
match self {
Fabric::Openfabric(fabric_section) => fabric_section.ip6_prefix(),
+ Fabric::Ospf(fabric_section) => fabric_section.ip6_prefix(),
}
}
}
@@ -190,17 +201,25 @@ impl From<FabricSection<OpenfabricProperties>> for Fabric
{
}
}
+impl From<FabricSection<OspfProperties>> for Fabric {
+ fn from(section: FabricSection<OspfProperties>) -> Self {
+ Fabric::Ospf(section)
+ }
+}
+
/// Enum containing all updater types for fabrics
#[derive(Debug, Clone, Serialize, Deserialize)]
#[serde(rename_all = "snake_case", tag = "protocol")]
pub enum FabricUpdater {
Openfabric(<FabricSection<OpenfabricProperties> as UpdaterType>::Updater),
+ Ospf(<FabricSection<OspfProperties> as UpdaterType>::Updater),
}
impl Updater for FabricUpdater {
fn is_empty(&self) -> bool {
match self {
FabricUpdater::Openfabric(updater) => updater.is_empty(),
+ FabricUpdater::Ospf(updater) => updater.is_empty(),
}
}
}
diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/node.rs
b/proxmox-ve-config/src/sdn/fabric/section_config/node.rs
index 510bfde..bd5ffea 100644
--- a/proxmox-ve-config/src/sdn/fabric/section_config/node.rs
+++ b/proxmox-ve-config/src/sdn/fabric/section_config/node.rs
@@ -12,7 +12,7 @@ use proxmox_schema::{
use crate::sdn::fabric::section_config::{
fabric::{FabricId, FABRIC_ID_REGEX_STR},
- protocol::openfabric::OpenfabricNodeProperties,
+ protocol::{openfabric::OpenfabricNodeProperties, ospf::OspfNodeProperties},
};
pub const NODE_ID_REGEX_STR: &str =
r"(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]){0,61}(?:[a-zA-Z0-9]){0,1})";
@@ -183,6 +183,7 @@ impl<T: ApiType> ApiType for NodeSection<T> {
#[serde(rename_all = "snake_case", tag = "protocol")]
pub enum Node {
Openfabric(NodeSection<OpenfabricNodeProperties>),
+ Ospf(NodeSection<OspfNodeProperties>),
}
impl Node {
@@ -190,6 +191,7 @@ impl Node {
pub fn id(&self) -> &NodeSectionId {
match self {
Node::Openfabric(node_section) => node_section.id(),
+ Node::Ospf(node_section) => node_section.id(),
}
}
@@ -197,6 +199,7 @@ impl Node {
pub fn ip(&self) -> Option<std::net::Ipv4Addr> {
match self {
Node::Openfabric(node_section) => node_section.ip(),
+ Node::Ospf(node_section) => node_section.ip(),
}
}
@@ -204,6 +207,7 @@ impl Node {
pub fn ip6(&self) -> Option<std::net::Ipv6Addr> {
match self {
Node::Openfabric(node_section) => node_section.ip6(),
+ Node::Ospf(node_section) => node_section.ip6(),
}
}
}
@@ -213,3 +217,9 @@ impl From<NodeSection<OpenfabricNodeProperties>> for Node {
Self::Openfabric(value)
}
}
+
+impl From<NodeSection<OspfNodeProperties>> for Node {
+ fn from(value: NodeSection<OspfNodeProperties>) -> Self {
+ Self::Ospf(value)
+ }
+}
diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs
b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs
index e5b800b..c1ec847 100644
--- a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs
+++ b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs
@@ -1 +1,2 @@
pub mod openfabric;
+pub mod ospf;
diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
new file mode 100644
index 0000000..4c368fa
--- /dev/null
+++ b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs
@@ -0,0 +1,85 @@
+use std::ops::Deref;
+
+use proxmox_network_types::ip_address::Ipv4Cidr;
+use proxmox_sdn_types::area::Area;
+use serde::{Deserialize, Serialize};
+
+use proxmox_schema::{api, property_string::PropertyString, ApiStringFormat,
Updater};
+
+use crate::sdn::fabric::section_config::interface::InterfaceName;
+
+#[api]
+#[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)]
+/// Properties for an Ospf fabric.
+pub struct OspfProperties {
+ /// OSPF area
+ pub(crate) area: Area,
+}
+
+impl OspfProperties {
+ pub fn set_area(&mut self, value: Area) {
+ self.area = value;
+ }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case", untagged)]
+pub enum OspfDeletableProperties {}
+
+#[api(
+ properties: {
+ interfaces: {
+ type: Array,
+ optional: true,
+ items: {
+ type: String,
+ description: "Properties for an Ospf interface.",
+ format:
&ApiStringFormat::PropertyString(&OspfInterfaceProperties::API_SCHEMA),
+ }
+ },
+ }
+)]
+#[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)]
+/// Properties for an Ospf node.
+pub struct OspfNodeProperties {
+ /// Interfaces for this Node.
+ #[serde(default)]
+ pub(crate) interfaces: Vec<PropertyString<OspfInterfaceProperties>>,
+}
+
+impl OspfNodeProperties {
+ pub fn interfaces(&self) -> impl Iterator<Item = &OspfInterfaceProperties>
{
+ self.interfaces
+ .iter()
+ .map(|property_string| property_string.deref())
+ }
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case", untagged)]
+pub enum OspfNodeDeletableProperties {
+ Interfaces,
+}
+
+#[api]
+#[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)]
+/// Properties for an OSPF interface.
+pub struct OspfInterfaceProperties {
+ pub(crate) name: InterfaceName,
+
+ /// If IP is unset, then this is an unnumbered interface
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub(crate) ip: Option<Ipv4Cidr>,
+}
+
+impl OspfInterfaceProperties {
+ /// Get the name of the OSPF interface.
+ pub fn name(&self) -> &InterfaceName {
+ &self.name
+ }
+
+ /// Get the ip (IPv4) of the OSPF interface.
+ pub fn ip(&self) -> Option<Ipv4Cidr> {
+ self.ip
+ }
+}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
