Remove options and mode from the ControllerConfig

agama-project · Dec 1, 2023 · 2052bf6 · 2052bf6
1 parent 15fa021
commit 2052bf6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 32 deletions.
diff --git a/rust/agama-dbus-server/src/network/dbus/interfaces.rs b/rust/agama-dbus-server/src/network/dbus/interfaces.rs
@@ -317,6 +317,19 @@ impl Bond {
         })
     }
 
+    /// Updates the connection data in the NetworkSystem.
+    ///
+    /// * `connection`: Updated connection.
+    async fn update_connection<'a>(
+        &self,
+        connection: MappedMutexGuard<'a, BondConnection>,
+    ) -> zbus::fdo::Result<()> {
+        let actions = self.actions.lock().await;
+        let connection = NetworkConnection::Bond(connection.clone());
+        actions.send(Action::UpdateConnection(connection)).unwrap();
+        Ok(())
+    }
+
     /// Updates the controller connection data in the NetworkSystem.
     ///
     /// * `connection`: Updated connection.
@@ -347,16 +360,11 @@ impl Bond {
     }
 
     #[dbus_interface(property)]
-    pub async fn set_mode(&mut self, mode: String) -> zbus::fdo::Result<()> {
-        let connection = self.get_bond().await;
-        let result = self
-            .update_controller_connection(
-                connection,
-                HashMap::from([("mode".to_string(), ControllerConfig::Mode(mode.clone()))]),
-            )
-            .await;
-        self.connection = Arc::new(Mutex::new(result?));
-        Ok(())
+    pub async fn set_mode(&mut self, mode: &str) -> zbus::fdo::Result<()> {
+        let mut connection = self.get_bond().await;
+        connection.set_mode(mode)?;
+
+        self.update_connection(connection).await
     }
 
     /// List of bond ports.
@@ -368,19 +376,11 @@ impl Bond {
     }
 
     #[dbus_interface(property)]
-    pub async fn set_options(&mut self, opts: String) -> zbus::fdo::Result<()> {
-        let connection = self.get_bond().await;
-        let result = self
-            .update_controller_connection(
-                connection,
-                HashMap::from([(
-                    "options".to_string(),
-                    ControllerConfig::Options(opts.clone()),
-                )]),
-            )
-            .await;
-        self.connection = Arc::new(Mutex::new(result.unwrap()));
-        Ok(())
+    pub async fn set_options(&mut self, opts: &str) -> zbus::fdo::Result<()> {
+        let mut connection = self.get_bond().await;
+        connection.set_options(opts)?;
+
+        self.update_connection(connection).await
     }
 
     /// List of bond ports.

diff --git a/rust/agama-dbus-server/src/network/model.rs b/rust/agama-dbus-server/src/network/model.rs
@@ -94,13 +94,6 @@ impl NetworkState {
         let controller = conn.clone();
 
         if let Connection::Bond(ref mut bond) = conn {
-            if let Some(ControllerConfig::Mode(mode)) = settings.get("mode") {
-                bond.set_mode(mode)?;
-            }
-            if let Some(ControllerConfig::Options(opts)) = settings.get("options") {
-                bond.set_options(opts.as_str())?;
-            }
-
             if let Some(ControllerConfig::Ports(ports)) = settings.get("ports") {
                 let new_ports: Vec<_> = ports
                     .iter()
@@ -661,8 +654,6 @@ pub struct BondConfig {
 /// Controller config payload for updating a controller's connection (Bond, Bridge)
 #[derive(Debug, PartialEq, Clone)]
 pub enum ControllerConfig {
-    Mode(String),
-    Options(String),
     Ports(Vec<String>),
 }