Move network to use the new actor service based model

Author: teclator

rust/agama-manager/src/actions.rs

@@ -20,7 +20,6 @@
 
 use std::{process::Command, sync::Arc};
 
-use agama_network::NetworkSystemClient;
 use agama_utils::{
     actor::Handler,
     api::{files::scripts::ScriptsGroup, status::Stage, Config, FinishMethod, Scope},
@@ -32,8 +31,8 @@ use gettextrs::gettext;
 use tokio::sync::RwLock;
 
 use crate::{
-    bootloader, checks, files, hostname, iscsi, l10n, proxy, s390, security, service, software,
-    storage, users,
+    bootloader, checks, files, hostname, iscsi, l10n, network, proxy, s390, security, service,
+    software, storage, users,
 };
 
 /// Implements the installation process.
@@ -43,7 +42,7 @@ pub struct InstallAction {
     pub hostname: Handler<hostname::Service>,
     pub issues: Handler<issue::Service>,
     pub l10n: Handler<l10n::Service>,
-    pub network: NetworkSystemClient,
+    pub network: Handler<network::Service>,
     pub proxy: Handler<proxy::Service>,
     pub software: Handler<software::Service>,
     pub storage: Handler<storage::Service>,
@@ -114,7 +113,7 @@ impl InstallAction {
         self.l10n.call(l10n::message::Install).await?;
         self.software.call(software::message::Finish).await?;
         self.files.call(files::message::Finish).await?;
-        self.network.install().await?;
+        self.network.call(network::message::Install).await?;
         self.proxy.call(proxy::message::Finish).await?;
         self.hostname.call(hostname::message::Install).await?;
         self.users.call(users::message::Install).await?;
@@ -160,7 +159,7 @@ pub struct SetConfigAction {
     pub hostname: Handler<hostname::Service>,
     pub iscsi: Handler<iscsi::Service>,
     pub l10n: Handler<l10n::Service>,
-    pub network: NetworkSystemClient,
+    pub network: Handler<network::Service>,
     pub proxy: Handler<proxy::Service>,
     pub progress: Handler<progress::Service>,
     pub questions: Handler<question::Service>,
@@ -353,8 +352,11 @@ impl SetConfigAction {
         self.progress
             .call(progress::message::Next::new(Scope::Manager))
             .await?;
-        self.network.update_config(network).await?;
-        self.network.apply().await?;
+        self.network
+            .call(network::message::SetConfig {
+                config: Box::new(network),
+            })
+            .await?;
 
         Ok(())
     }

rust/agama-manager/src/service.rs

@@ -38,7 +38,6 @@ use agama_utils::{
 };
 use async_trait::async_trait;
 use merge::Merge;
-use network::NetworkSystemClient;
 use serde_json::Value;
 use std::{collections::HashMap, sync::Arc};
 use tokio::sync::{broadcast, RwLock};
@@ -107,7 +106,7 @@ pub struct Starter {
     hostname: Option<Handler<hostname::Service>>,
     iscsi: Option<Handler<iscsi::Service>>,
     l10n: Option<Handler<l10n::Service>>,
-    network: Option<NetworkSystemClient>,
+    network: Option<Handler<network::Service>>,
     proxy: Option<Handler<proxy::Service>>,
     security: Option<Handler<security::Service>>,
     software: Option<Handler<software::Service>>,
@@ -163,7 +162,7 @@ impl Starter {
         self
     }
 
-    pub fn with_network(mut self, network: NetworkSystemClient) -> Self {
+    pub fn with_network(mut self, network: Handler<network::Service>) -> Self {
         self.network = Some(network);
         self
     }
@@ -421,7 +420,7 @@ pub struct Service {
     proxy: Handler<proxy::Service>,
     l10n: Handler<l10n::Service>,
     software: Handler<software::Service>,
-    network: NetworkSystemClient,
+    network: Handler<network::Service>,
     storage: Handler<storage::Service>,
     issues: Handler<issue::Service>,
     progress: Handler<progress::Service>,
@@ -465,8 +464,8 @@ impl Service {
 
     // Configure the network according to defaults
     async fn network_default(&mut self) -> Result<(), Error> {
-        self.network.propose_default().await?;
-        self.network.apply().await?;
+        self.network.call(network::message::ProposeDefault).await?;
+        self.network.call(network::message::Apply).await?;
         Ok(())
     }
 
@@ -630,7 +629,7 @@ impl MessageHandler<message::GetSystem> for Service {
         let manager = self.system.clone();
         let storage = self.storage.call(storage::message::GetSystem).await?;
         let iscsi = self.iscsi.call(iscsi::message::GetSystem).await?;
-        let network = self.network.get_system().await?;
+        let network = self.network.call(network::message::GetSystem).await?;
 
         let s390 = if let Some(s390) = &self.s390 {
             Some(s390.call(s390::message::GetSystem).await?)
@@ -679,7 +678,7 @@ impl MessageHandler<message::GetExtendedConfig> for Service {
         let security = self.config.security.clone();
         let proxy = self.proxy.call(proxy::message::GetConfig).await?;
         let questions = self.questions.call(question::message::GetConfig).await?;
-        let network = self.network.get_config().await?;
+        let network = self.network.call(network::message::GetConfig).await?;
         let storage = self.storage.call(storage::message::GetConfig).await?;
         let users = self.users.call(users::message::GetConfig).await?;
 
@@ -749,7 +748,7 @@ impl MessageHandler<message::GetProposal> for Service {
         let hostname = self.hostname.call(hostname::message::GetProposal).await?;
         let l10n = self.l10n.call(l10n::message::GetProposal).await?;
         let storage = self.storage.call(storage::message::GetProposal).await?;
-        let network = self.network.get_proposal().await?;
+        let network = self.network.call(network::message::GetProposal).await?;
         let users = self.users.call(users::message::GetProposal).await?;
 
         // If the software service is busy, it will not answer.

rust/agama-manager/src/tasks/runner.rs

@@ -20,11 +20,10 @@
 
 use crate::{
     actions::{FinishAction, InstallAction, SetConfigAction},
-    bootloader, files, hostname, iscsi, l10n, proxy, s390, security, service, software, storage,
+    bootloader, files, hostname, iscsi, l10n, network, proxy, s390, security, service, software, storage,
     tasks::message,
     users,
 };
-use agama_network::NetworkSystemClient;
 use agama_utils::{
     actor::{Actor, Handler, MessageHandler},
     api::{FinishMethod, Scope},
@@ -45,7 +44,7 @@ pub struct TasksRunner {
     pub iscsi: Handler<iscsi::Service>,
     pub issues: Handler<issue::Service>,
     pub l10n: Handler<l10n::Service>,
-    pub network: NetworkSystemClient,
+    pub network: Handler<network::Service>,
     pub progress: Handler<progress::Service>,
     pub proxy: Handler<proxy::Service>,
     pub questions: Handler<question::Service>,

rust/agama-network/src/action.rs

@@ -18,11 +18,11 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::{model::StateConfig, Action, NetworkState};
-use agama_utils::{api::event::Event, issue, progress};
+use crate::{model::StateConfig, NetworkState, Service};
+use agama_utils::{actor::Handler, api::event::Event, issue, progress};
 use async_trait::async_trait;
 use thiserror::Error;
-use tokio::sync::{broadcast, mpsc::UnboundedSender};
+use tokio::sync::broadcast;
 
 #[derive(Error, Debug)]
 pub enum NetworkAdapterError {
@@ -68,9 +68,6 @@ impl From<NetworkAdapterError> for zbus::fdo::Error {
 pub trait Watcher {
     /// Listens for network changes and emit actions to update the state.
     ///
-    /// * `actions`: channel to emit the actions.
-    async fn run(
-        self: Box<Self>,
-        actions: UnboundedSender<Action>,
-    ) -> Result<(), NetworkAdapterError>;
+    /// * `handler`: handler to the service to emit the actions.
+    async fn run(self: Box<Self>, handler: Handler<Service>) -> Result<(), NetworkAdapterError>;
 }

rust/agama-network/src/adapter.rs

@@ -22,18 +22,17 @@
 //!
 //! This library implements the network configuration service for Agama.
 
-pub mod action;
 pub mod adapter;
 pub mod error;
+pub mod message;
 pub mod model;
 mod nm;
 mod service;
 pub mod types;
 
-pub use action::Action;
 pub use adapter::{Adapter, NetworkAdapterError};
 pub use model::NetworkState;
 pub use nm::NetworkManagerAdapter;
-pub use service::{NetworkSystemClient, NetworkSystemError, Service, Starter};
+pub use service::{NetworkSystemError, Service, Starter};
 
 pub mod test_utils;