rust/agama-dbus-server/src/network/model.rs

@@ -472,46 +472,6 @@ pub enum ConnectionConfig {
     Infiniband(InfinibandConfig),
 }
 
-#[derive(Default, Debug, PartialEq, Clone)]
-pub struct InfinibandConfig {
-    pub p_key: Option<i32>,
-    pub parent: Option<String>,
-    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<Self, Self::Err> {
-        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)
-    }
-}
-
 #[derive(Default, Debug, PartialEq, Clone)]
 pub enum PortConfig {
     #[default]
@@ -1040,3 +1000,43 @@ pub struct BridgePortConfig {
     pub priority: Option<u32>,
     pub path_cost: Option<u32>,
 }
+
+#[derive(Default, Debug, PartialEq, Clone)]
+pub struct InfinibandConfig {
+    pub p_key: Option<i32>,
+    pub parent: Option<String>,
+    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<Self, Self::Err> {
+        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)
+    }
+}

rust/agama-dbus-server/src/network/nm/dbus.rs

@@ -502,22 +502,22 @@ fn infiniband_config_from_dbus(conn: &OwnedNestedHash) -> Option<InfinibandConfi
         return None;
     };
 
-    let mut config = InfinibandConfig::default();
+    let mut infiniband_config = InfinibandConfig::default();
 
     if let Some(p_key) = infiniband.get("p-key") {
-        config.p_key = Some(*p_key.downcast_ref::<i32>()?);
+        infiniband_config.p_key = Some(*p_key.downcast_ref::<i32>()?);
     }
 
     if let Some(parent) = infiniband.get("parent") {
-        config.parent = Some(parent.downcast_ref::<str>()?.to_string());
+        infiniband_config.parent = Some(parent.downcast_ref::<str>()?.to_string());
     }
 
     if let Some(transport_mode) = infiniband.get("transport-mode") {
-        config.transport_mode =
+        infiniband_config.transport_mode =
             InfinibandTransportMode::from_str(transport_mode.downcast_ref::<str>()?).ok()?;
     }
 
-    Some(config)
+    Some(infiniband_config)
 }
 
 /// Converts a MatchConfig struct into a HashMap that can be sent over D-Bus.