Restart operation on child-devices

crates/common/tedge_config/src/system_services/managers/config.rs

@@ -3,6 +3,7 @@ use camino::Utf8Path;
 use serde::Deserialize;
 use std::collections::HashMap;
 use std::fs;
+use std::time::Duration;
 
 pub const SERVICE_CONFIG_FILE: &str = "system.toml";
 const REBOOT_COMMAND: &[&str] = &["init", "6"];
@@ -32,6 +33,23 @@ pub struct InitConfig {
 #[serde(deny_unknown_fields)]
 pub struct SystemSpecificCommands {
     pub reboot: Vec<String>,
+    #[serde(default = "SystemSpecificCommands::default_reboot_timeout_seconds")]
+    pub reboot_timeout_seconds: u64,
+}
+
+impl SystemSpecificCommands {
+    pub fn default_reboot_timeout_seconds() -> u64 {
+        // The linux shutdown command only supports triggering the shutdown immediately
+        // or in minutes, a delay in seconds is not supported. Using a shell script to delay
+        // the call to shutdown is generally not very reliable.
+        // Choose a sensible default that won't timeout if 'shutdown -r' is used
+        // (with some buffer), e.g. 2 x default interval (60 seconds)
+        120
+    }
+
+    pub fn reboot_timeout(&self) -> Duration {
+        Duration::from_secs(self.reboot_timeout_seconds)
+    }
 }
 
 impl Default for SystemSpecificCommands {
@@ -41,6 +59,7 @@ impl Default for SystemSpecificCommands {
                 .iter()
                 .map(|value| String::from(*value))
                 .collect::<Vec<String>>(),
+            reboot_timeout_seconds: SystemSpecificCommands::default_reboot_timeout_seconds(),
         }
     }
 }

crates/core/c8y_api/src/json_c8y.rs

@@ -498,7 +498,7 @@ mod tests {
         let expected_json = r#"{"c8y_SoftwareList":[{"name":"a","version":"::debian","url":""},{"name":"b","version":"1.0::debian","url":""},{"name":"c","version":"::debian","url":"https://foobar.io/c.deb"},{"name":"d","version":"beta::debian","url":"https://foobar.io/d.deb"},{"name":"m","version":"::apama","url":"https://foobar.io/m.epl"}]}"#;
 
         assert_eq!(c8y_software_list, expected_struct);
-        assert_eq!(c8y_software_list.to_json().unwrap(), expected_json);
+        assert_eq!(c8y_software_list.to_json(), expected_json);
     }
 
     #[test]
@@ -518,7 +518,7 @@ mod tests {
         let expected_json = r#"{"c8y_SoftwareList":[]}"#;
 
         assert_eq!(c8y_software_list, expected_struct);
-        assert_eq!(c8y_software_list.to_json().unwrap(), expected_json);
+        assert_eq!(c8y_software_list.to_json(), expected_json);
     }
 
     #[test]

crates/core/c8y_api/src/smartrest/smartrest_deserializer.rs

@@ -542,7 +542,7 @@ mod tests {
             .from_smartrest(&smartrest)
             .unwrap()
             .to_thin_edge_json_with_id("123");
-        let output_json = software_update_request.unwrap().to_json().unwrap();
+        let output_json = software_update_request.unwrap().to_json();
 
         let expected_json = json!({
             "id": "123",

crates/core/c8y_api/src/smartrest/topic.rs

@@ -19,6 +19,18 @@ pub enum C8yTopic {
 }
 
 impl C8yTopic {
+    /// Return the c8y SmartRest response topic for the given entity
+    pub fn smartrest_response_topic(entity: &EntityMetadata) -> Option<Topic> {
+        match entity.r#type {
+            EntityType::MainDevice => Some(C8yTopic::upstream_topic()),
+            EntityType::ChildDevice | EntityType::Service => {
+                Self::ChildSmartRestResponse(entity.entity_id.clone())
+                    .to_topic()
+                    .ok()
+            }
+        }
+    }
+
     pub fn to_topic(&self) -> Result<Topic, MqttError> {
         Topic::new(self.to_string().as_str())
     }

crates/core/tedge_agent/src/agent.rs

@@ -85,7 +85,8 @@ impl AgentConfig {
             .with_ip_address(http_bind_address);
 
         // Restart config
-        let restart_config = RestartManagerConfig::from_tedge_config(tedge_config_location)?;
+        let restart_config =
+            RestartManagerConfig::from_tedge_config(&mqtt_device_topic_id, tedge_config_location)?;
 
         // Software update config
         let sw_update_config = SoftwareManagerConfig::from_tedge_config(tedge_config_location)?;
@@ -170,6 +171,8 @@ impl Agent {
 
         // Converter actor
         let converter_actor_builder = TedgeOperationConverterBuilder::new(
+            self.config.mqtt_topic_root.as_ref(),
+            self.config.mqtt_device_topic_id.clone(),
             &mut software_update_builder,
             &mut restart_actor_builder,
             &mut mqtt_actor_builder,

crates/core/tedge_agent/src/file_transfer_server/http_rest.rs

@@ -271,8 +271,8 @@ mod test {
         assert_eq!(actual_file_name, expected_file_name);
     }
 
-    const VALID_TEST_URI: &str = "http://127.0.0.1:3000/tedge/file-transfer/another/dir/test-file";
-    const INVALID_TEST_URI: &str = "http://127.0.0.1:3000/wrong/place/test-file";
+    const VALID_TEST_URI: &str = "http://127.0.0.1:3333/tedge/file-transfer/another/dir/test-file";
+    const INVALID_TEST_URI: &str = "http://127.0.0.1:3333/wrong/place/test-file";
 
     #[test_case(hyper::Method::GET, VALID_TEST_URI, hyper::StatusCode::OK)]
     #[test_case(hyper::Method::GET, INVALID_TEST_URI, hyper::StatusCode::NOT_FOUND)]
@@ -348,7 +348,7 @@ mod test {
         let tempdir_path = ttd.utf8_path_buf();
         let http_config = HttpConfig::default()
             .with_data_dir(tempdir_path)
-            .with_port(3000);
+            .with_port(3333);
         let server = http_file_transfer_server(&http_config).unwrap();
         (ttd, server)
     }