adapt dbus API to prepare for answers file and change use_defaults to…

doc/answers_example.yaml

@@ -0,0 +1,3 @@
+answers:
+  - class: storage.luks_activation
+    answer: "skip"

doc/dbus/bus/org.opensuse.Agama.Questions1.bus.xml

@@ -87,10 +87,13 @@
     <method name="Delete">
       <arg name="question" type="o" direction="in"/>
     </method>
+    <method name="AddAnswerFile">
+      <arg name="path" type="s" direction="in"/>
+    </method>
     <!--
-     sets questions to be answered by default answer instead of asking user
+     property that defines if questions is interactive or automatically answered with
+     default answer
      -->
-    <method name="UseDefaultAnswer">
-    </method>
+    <property name="Interactive" type="b" access="readwrite"/>
   </interface>
 </node>

doc/dbus/org.opensuse.Agama.Questions1.doc.xml

@@ -76,18 +76,30 @@ when the question is answered and the answer is successfully read.
       <arg name="data" direction="in" type="a{ss}"/>
       <arg direction="out" type="o"/>
     </method>
+    <!--
+      Delete:
+      @question: object path of question that should be deleted.
+
+      Deletes question. Useful when question is answered and service that asks
+      already read answer. Usually called by the one that previously created it.
+    -->
     <method name="Delete">
-      <arg name="question" direction="in" type="o"/>
+      <arg name="question" type="o" direction="in"/>
     </method>
-
     <!--
-      UseDefaultAnswer:
+      AddAnswerFile:
+      @path: Local fs path to answers file in yaml format.
 
-      Switches questions to be automatically answered by default answer.
-      After this method call each follow up question is immediatelly answered.
-      Useful for doing non interactive installation.
+      Adds file with list of predefined answers that will be used to
+      automatically answer matching questions.
     -->
-    <method name="UseDefaultAnswer">
+    <method name="AddAnswerFile">
+      <arg name="path" type="s" direction="in"/>
     </method>
+    <!--
+     property that defines if questions is interactive or automatically answered with
+     default answer
+     -->
+    <property name="Interactive" type="b" access="readwrite"/>
   </interface>
 </node>

rust/agama-cli/src/questions.rs

@@ -1,12 +1,15 @@
 use agama_lib::connection;
 use agama_lib::proxies::Questions1Proxy;
-use anyhow::{Context, Ok};
+use anyhow::Context;
 use clap::{Args, Subcommand, ValueEnum};
 
 #[derive(Subcommand, Debug)]
 pub enum QuestionsCommands {
     /// Set mode for answering questions.
     Mode(ModesArgs),
+    Answers {
+        path: String,
+    },
 }
 
 #[derive(Args, Debug)]
@@ -20,29 +23,31 @@ pub enum Modes {
     Interactive,
     NonInteractive,
 }
-// TODO when more commands is added, refactor and add it to agama-lib and share a bit of functionality
-async fn set_mode(value: Modes) -> anyhow::Result<()> {
-    match value {
-        Modes::NonInteractive => {
-            let connection = connection().await?;
-            let proxy = Questions1Proxy::new(&connection)
-                .await
-                .context("Failed to connect to Questions service")?;
 
-            // TODO: how to print dbus error in that anyhow?
-            proxy
-                .use_default_answer()
-                .await
-                .context("Failed to set default answer")?;
-        }
-        Modes::Interactive => log::info!("not implemented"), //TODO do it
-    }
+async fn set_mode(proxy: Questions1Proxy<'_>, value: Modes) -> anyhow::Result<()> {
+    // TODO: how to print dbus error in that anyhow?
+    proxy
+        .set_interactive(value == Modes::Interactive)
+        .await
+        .context("Failed to set mode for answering questions.")
+}
 
-    Ok(())
+async fn set_answers(proxy: Questions1Proxy<'_>, path: String) -> anyhow::Result<()> {
+    // TODO: how to print dbus error in that anyhow?
+    proxy
+        .add_answer_file(path.as_str())
+        .await
+        .context("Failed to set answers from answers file")
 }
 
 pub async fn run(subcommand: QuestionsCommands) -> anyhow::Result<()> {
+    let connection = connection().await?;
+    let proxy = Questions1Proxy::new(&connection)
+        .await
+        .context("Failed to connect to Questions service")?;
+
     match subcommand {
-        QuestionsCommands::Mode(value) => set_mode(value.value).await,
+        QuestionsCommands::Mode(value) => set_mode(proxy, value.value).await,
+        QuestionsCommands::Answers { path } => set_answers(proxy, path).await,
     }
 }

rust/agama-dbus-server/Cargo.toml

@@ -18,3 +18,5 @@ async-std = { version = "1.12.0", features = ["attributes"]}
 uuid = { version = "1.3.4", features = ["v4"] }
 parking_lot = "0.12.1"
 thiserror = "1.0.40"
+serde = { version = "1.0.152", features = ["derive"] }
+serde_yaml = "0.9.24"

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

@@ -3,7 +3,7 @@ use agama_lib::network::types::DeviceType;
 
 /// Networking actions, like adding, updating or removing connections.
 ///
-/// These actions are meant to be processed by [crate::system::NetworkSystem], updating the model
+/// These actions are meant to be processed by [crate::network::system::NetworkSystem], updating the model
 /// and the D-Bus tree as needed.
 #[derive(Debug)]
 pub enum Action {

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

@@ -82,7 +82,7 @@ impl Device {
     ///
     /// Possible values: 0 = loopback, 1 = ethernet, 2 = wireless.
     ///
-    /// See [crate::model::DeviceType].
+    /// See [agama_lib::network::types::DeviceType].
     #[dbus_interface(property, name = "Type")]
     pub fn device_type(&self) -> u8 {
         self.device.type_ as u8
@@ -124,7 +124,7 @@ impl Connections {
     /// Adds a new network connection.
     ///
     /// * `id`: connection name.
-    /// * `ty`: connection type (see [crate::model::DeviceType]).
+    /// * `ty`: connection type (see [agama_lib::network::types::DeviceType]).
     pub async fn add_connection(&mut self, id: String, ty: u8) -> zbus::fdo::Result<()> {
         let actions = self.actions.lock();
         actions
@@ -274,7 +274,7 @@ impl Ipv4 {
     ///
     /// Possible values: "disabled", "auto", "manual" or "link-local".
     ///
-    /// See [crate::model::IpMethod].
+    /// See [crate::network::model::IpMethod].
     #[dbus_interface(property)]
     pub fn method(&self) -> String {
         let connection = self.get_connection();
@@ -401,7 +401,7 @@ impl Wireless {
     ///
     /// Possible values: "unknown", "adhoc", "infrastructure", "ap" or "mesh".
     ///
-    /// See [crate::model::WirelessMode].
+    /// See [crate::network::model::WirelessMode].
     #[dbus_interface(property)]
     pub fn mode(&self) -> String {
         let connection = self.get_wireless();
@@ -442,7 +442,7 @@ impl Wireless {
     /// Possible values: "none", "owe", "ieee8021x", "wpa-psk", "sae", "wpa-eap",
     /// "wpa-eap-suite-b192".
     ///
-    /// See [crate::model::SecurityProtocol].
+    /// See [crate::network::model::SecurityProtocol].
     #[dbus_interface(property)]
     pub fn security(&self) -> String {
         let connection = self.get_wireless();

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

@@ -9,6 +9,8 @@ use anyhow::Context;
 use log;
 use zbus::{dbus_interface, fdo::ObjectManager, zvariant::ObjectPath, Connection};
 
+mod answers;
+
 #[derive(Clone, Debug)]
 struct GenericQuestionObject(questions::GenericQuestion);
 
@@ -81,7 +83,11 @@ enum QuestionType {
 }
 
 /// Trait for objects that can provide answers to all kind of Question.
+///
+/// If no strategy is selected or the answer is unknown, then ask to the user.
 trait AnswerStrategy {
+    /// Id for quick runtime inspection of strategy type
+    fn id(&self) -> u8;
     /// Provides answer for generic question
     ///
     /// I gets as argument the question to answer. Returned value is `answer`
@@ -103,7 +109,17 @@ trait AnswerStrategy {
 /// AnswerStrategy that provides as answer the default option.
 struct DefaultAnswers;
 
+impl DefaultAnswers {
+    pub fn id() -> u8 {
+        1
+    }
+}
+
 impl AnswerStrategy for DefaultAnswers {
+    fn id(&self) -> u8 {
+        DefaultAnswers::id()
+    }
+
     fn answer(&self, question: &GenericQuestion) -> Option<String> {
         Some(question.default_option.clone())
     }
@@ -227,11 +243,43 @@ impl Questions {
         Ok(())
     }
 
-    /// sets questions to be answered by default answer instead of asking user
-    async fn use_default_answer(&mut self) -> Result<(), Error> {
-        log::info!("Answer questions with default option");
-        self.answer_strategies.push(Box::new(DefaultAnswers {}));
-        Ok(())
+    /// property that defines if questions is interactive or automatically answered with
+    /// default answer
+    #[dbus_interface(property)]
+    fn interactive(&self) -> bool {
+        let last = self.answer_strategies.last();
+        if let Some(real_strategy) = last {
+            real_strategy.id() != DefaultAnswers::id()
+        } else {
+            true
+        }
+    }
+
+    #[dbus_interface(property)]
+    fn set_interactive(&mut self, value: bool) {
+        if value != self.interactive() {
+            log::info!("interactive value unchanged - {}", value);
+            return;
+        }
+
+        log::info!("set interactive to {}", value);
+        if value {
+            self.answer_strategies.pop();
+        } else {
+            self.answer_strategies.push(Box::new(DefaultAnswers {}));
+        }
+    }
+
+    fn add_answer_file(&mut self, path: String) -> Result<(), Error> {
+        log::info!("Adding answer file {}", path);
+        let answers = answers::Answers::new_from_file(path.as_str());
+        match answers {
+            Ok(answers) => {
+                self.answer_strategies.push(Box::new(answers));
+                Ok(())
+            }
+            Err(e) => Err(e.into()),
+        }
     }
 }