Drop dbus server completely

rust/agama-lib/src/network/client.rs

@@ -1,5 +1,4 @@
-use super::settings::{BondSettings, MatchSettings, NetworkConnection, WirelessSettings};
-use super::types::{Device, DeviceState, DeviceType, SSID};
+use super::{settings::NetworkConnection, types::Device};
 use crate::error::ServiceError;
 use reqwest::{Client, Response};
 use serde_json;

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

@@ -1,6 +1,6 @@
 use agama_server::{
     l10n::{self, helpers},
-    network, questions,
+    questions,
 };
 
 use agama_lib::connection_to;
@@ -41,8 +41,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     log::info!("Started questions interface");
     l10n::export_dbus_objects(&connection, &locale).await?;
     log::info!("Started locale interface");
-    network::export_dbus_objects(&connection).await?;
-    log::info!("Started network interface");
 
     connection
         .request_name(SERVICE_NAME)

rust/agama-server/src/network.rs

@@ -40,7 +40,6 @@
 
 mod action;
 mod adapter;
-pub mod dbus;
 pub mod error;
 pub mod model;
 mod nm;
@@ -49,17 +48,6 @@ pub mod web;
 
 pub use action::Action;
 pub use adapter::{Adapter, NetworkAdapterError};
-pub use dbus::NetworkService;
 pub use model::NetworkState;
 pub use nm::NetworkManagerAdapter;
 pub use system::NetworkSystem;
-use zbus::Connection;
-
-pub async fn export_dbus_objects(
-    connection: &Connection,
-) -> Result<(), Box<dyn std::error::Error>> {
-    let adapter = NetworkManagerAdapter::from_system()
-        .await
-        .expect("Could not connect to NetworkManager to read the configuration.");
-    NetworkService::start(connection, adapter).await
-}

rust/agama-server/src/network/action.rs

@@ -2,7 +2,6 @@ use crate::network::model::{AccessPoint, Connection, Device};
 use agama_lib::network::types::DeviceType;
 use tokio::sync::oneshot;
 use uuid::Uuid;
-use zbus::zvariant::OwnedObjectPath;
 
 use super::{error::NetworkStateError, model::GeneralState, NetworkAdapterError};
 
@@ -16,11 +15,7 @@ pub type ControllerConnection = (Connection, Vec<String>);
 #[derive(Debug)]
 pub enum Action {
     /// Add a new connection with the given name and type.
-    AddConnection(
-        String,
-        DeviceType,
-        Responder<Result<OwnedObjectPath, NetworkStateError>>,
-    ),
+    AddConnection(String, DeviceType, Responder<Result<(), NetworkStateError>>),
     /// Add a new connection
     NewConnection(Box<Connection>, Responder<Result<(), NetworkStateError>>),
     /// Gets a connection by its id
@@ -29,12 +24,6 @@ pub enum Action {
     GetConnectionByUuid(Uuid, Responder<Option<Connection>>),
     /// Gets a connection
     GetConnections(Responder<Vec<Connection>>),
-    /// Gets a connection path
-    GetConnectionPath(Uuid, Responder<Option<OwnedObjectPath>>),
-    /// Gets a connection path by id
-    GetConnectionPathById(String, Responder<Option<OwnedObjectPath>>),
-    /// Get connections paths
-    GetConnectionsPaths(Responder<Vec<OwnedObjectPath>>),
     /// Gets a controller connection
     GetController(
         Uuid,
@@ -52,10 +41,6 @@ pub enum Action {
     GetDevice(String, Responder<Option<Device>>),
     /// Gets all the existent devices
     GetDevices(Responder<Vec<Device>>),
-    /// Gets a device path
-    GetDevicePath(String, Responder<Option<OwnedObjectPath>>),
-    /// Get devices paths
-    GetDevicesPaths(Responder<Vec<OwnedObjectPath>>),
     GetGeneralState(Responder<GeneralState>),
     /// Sets a controller's ports. It uses the Uuid of the controller and the IDs or interface names
     /// of the ports.