From 8a6948cbc2b06430cf0c078fe1566e46457a51da Mon Sep 17 00:00:00 2001 From: Jorik Cronenberg Date: Thu, 8 Feb 2024 14:29:27 +0100 Subject: [PATCH 1/2] Add infiniband to network model --- rust/agama-server/src/network/model.rs | 41 +++++++++ rust/agama-server/src/network/nm/dbus.rs | 109 ++++++++++++++++++++++- 2 files changed, 149 insertions(+), 1 deletion(-) diff --git a/rust/agama-server/src/network/model.rs b/rust/agama-server/src/network/model.rs index 551c353496..624618094a 100644 --- a/rust/agama-server/src/network/model.rs +++ b/rust/agama-server/src/network/model.rs @@ -469,6 +469,7 @@ pub enum ConnectionConfig { Bond(BondConfig), Vlan(VlanConfig), Bridge(BridgeConfig), + Infiniband(InfinibandConfig), } #[derive(Default, Debug, PartialEq, Clone)] @@ -999,3 +1000,43 @@ pub struct BridgePortConfig { pub priority: Option, pub path_cost: Option, } + +#[derive(Default, Debug, PartialEq, Clone)] +pub struct InfinibandConfig { + pub p_key: Option, + pub parent: Option, + pub transport_mode: InfinibandTransportMode, +} + +#[derive(Default, Debug, PartialEq, Clone)] +pub enum InfinibandTransportMode { + #[default] + Datagram, + Connected, +} + +#[derive(Debug, Error)] +#[error("Invalid infiniband transport-mode: {0}")] +pub struct InvalidInfinibandTransportMode(String); + +impl FromStr for InfinibandTransportMode { + type Err = InvalidInfinibandTransportMode; + + fn from_str(s: &str) -> Result { + match s { + "datagram" => Ok(Self::Datagram), + "connected" => Ok(Self::Connected), + _ => Err(InvalidInfinibandTransportMode(s.to_string())), + } + } +} + +impl fmt::Display for InfinibandTransportMode { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + let name = match &self { + InfinibandTransportMode::Datagram => "datagram", + InfinibandTransportMode::Connected => "connected", + }; + write!(f, "{}", name) + } +} diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs index 75876ad163..7630c8aaca 100644 --- a/rust/agama-server/src/network/nm/dbus.rs +++ b/rust/agama-server/src/network/nm/dbus.rs @@ -23,6 +23,7 @@ const DUMMY_KEY: &str = "dummy"; const VLAN_KEY: &str = "vlan"; const BRIDGE_KEY: &str = "bridge"; const BRIDGE_PORT_KEY: &str = "bridge-port"; +const INFINIBAND_KEY: &str = "infiniband"; /// Converts a connection struct into a HashMap that can be sent over D-Bus. /// @@ -97,6 +98,10 @@ pub fn connection_to_dbus<'a>( connection_dbus.insert("type", BRIDGE_KEY.into()); result.insert(BRIDGE_KEY, bridge_config_to_dbus(bridge)); } + ConnectionConfig::Infiniband(infiniband) => { + connection_dbus.insert("type", INFINIBAND_KEY.into()); + result.insert(INFINIBAND_KEY, infiniband_config_to_dbus(infiniband)); + } _ => {} } @@ -141,6 +146,11 @@ pub fn connection_from_dbus(conn: OwnedNestedHash) -> Option { return Some(connection); } + if let Some(infiniband_config) = infiniband_config_from_dbus(&conn) { + connection.config = ConnectionConfig::Infiniband(infiniband_config); + return Some(connection); + } + if conn.get(DUMMY_KEY).is_some() { connection.config = ConnectionConfig::Dummy; return Some(connection); @@ -477,6 +487,45 @@ fn bridge_port_config_from_dbus(conn: &OwnedNestedHash) -> Option HashMap<&str, zvariant::Value> { + let mut infiniband_config: HashMap<&str, zvariant::Value> = HashMap::from([ + ( + "transport-mode", + Value::new(config.transport_mode.to_string()), + ), + ("p-key", Value::new(config.p_key.unwrap_or(-1))), + ]); + + if let Some(parent) = &config.parent { + infiniband_config.insert("parent", parent.into()); + } + + infiniband_config +} + +fn infiniband_config_from_dbus(conn: &OwnedNestedHash) -> Option { + let Some(infiniband) = conn.get(INFINIBAND_KEY) else { + return None; + }; + + let mut infiniband_config = InfinibandConfig::default(); + + if let Some(p_key) = infiniband.get("p-key") { + infiniband_config.p_key = Some(*p_key.downcast_ref::()?); + } + + if let Some(parent) = infiniband.get("parent") { + infiniband_config.parent = Some(parent.downcast_ref::()?.to_string()); + } + + if let Some(transport_mode) = infiniband.get("transport-mode") { + infiniband_config.transport_mode = + InfinibandTransportMode::from_str(transport_mode.downcast_ref::()?).ok()?; + } + + Some(infiniband_config) +} + /// Converts a MatchConfig struct into a HashMap that can be sent over D-Bus. /// /// * `match_config`: MatchConfig to convert. @@ -852,7 +901,7 @@ mod test { }; use crate::network::{ model::*, - nm::dbus::{BOND_KEY, ETHERNET_KEY, WIRELESS_KEY, WIRELESS_SECURITY_KEY}, + nm::dbus::{BOND_KEY, ETHERNET_KEY, INFINIBAND_KEY, WIRELESS_KEY, WIRELESS_SECURITY_KEY}, }; use agama_lib::network::types::{BondMode, SSID}; use cidr::IpInet; @@ -1080,6 +1129,64 @@ mod test { } } + #[test] + fn test_connection_from_dbus_infiniband() { + let uuid = Uuid::new_v4().to_string(); + let connection_section = HashMap::from([ + ("id".to_string(), Value::new("ib0").to_owned()), + ("uuid".to_string(), Value::new(uuid).to_owned()), + ]); + + let infiniband_section = HashMap::from([ + ("p-key".to_string(), Value::new(0x8001 as i32).to_owned()), + ("parent".to_string(), Value::new("ib0").to_owned()), + ( + "transport-mode".to_string(), + Value::new("datagram").to_owned(), + ), + ]); + + let dbus_conn = HashMap::from([ + ("connection".to_string(), connection_section), + (INFINIBAND_KEY.to_string(), infiniband_section), + ]); + + let connection = connection_from_dbus(dbus_conn).unwrap(); + let ConnectionConfig::Infiniband(infiniband) = &connection.config else { + panic!("Wrong connection type") + }; + assert_eq!(infiniband.p_key, Some(0x8001)); + assert_eq!(infiniband.parent, Some("ib0".to_string())); + assert_eq!(infiniband.transport_mode, InfinibandTransportMode::Datagram); + } + + #[test] + fn test_dbus_from_infiniband_connection() { + let config = InfinibandConfig { + p_key: Some(0x8002), + parent: Some("ib1".to_string()), + transport_mode: InfinibandTransportMode::Connected, + }; + let mut infiniband = build_base_connection(); + infiniband.config = ConnectionConfig::Infiniband(config); + let infiniband_dbus = connection_to_dbus(&infiniband, None); + + let infiniband = infiniband_dbus.get(INFINIBAND_KEY).unwrap(); + let p_key: i32 = *infiniband.get("p-key").unwrap().downcast_ref().unwrap(); + assert_eq!(p_key, 0x8002); + let parent: &str = infiniband.get("parent").unwrap().downcast_ref().unwrap(); + assert_eq!(parent, "ib1"); + let transport_mode: &str = infiniband + .get("transport-mode") + .unwrap() + .downcast_ref() + .unwrap(); + assert_eq!( + transport_mode, + InfinibandTransportMode::Connected.to_string() + ); + } + #[test] fn test_dbus_from_wireless_connection() { let config = WirelessConfig { From c75ed020bc62c7db77f325b3e479c9060dbe388d Mon Sep 17 00:00:00 2001 From: Jorik Cronenberg Date: Thu, 8 Feb 2024 15:45:04 +0100 Subject: [PATCH 2/2] Update agama-cli.changes --- rust/package/agama.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rust/package/agama.changes b/rust/package/agama.changes index 8e64449ffe..7a14494058 100644 --- a/rust/package/agama.changes +++ b/rust/package/agama.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 13 12:42:58 UTC 2024 - Jorik Cronenberg + +- Add infiniband to network model (gh#openSUSE/agama#1032). + ------------------------------------------------------------------- Thu Mar 7 10:52:58 UTC 2024 - Michal Filka