Merge pull request #3033 from reubenmiller/fix-tedge-agent-as-child-d…

…evice fix: tedge-agent use the root topic when provided by the cli flag
thin-edge · Aug 1, 2024 · 139a5ae · 139a5ae
2 parents 3bc7785 + a3a5356
commit 139a5ae
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/crates/core/tedge_agent/src/agent.rs b/crates/core/tedge_agent/src/agent.rs
@@ -138,8 +138,11 @@ impl AgentConfig {
         let sw_update_config = SoftwareManagerConfig::from_tedge_config(tedge_config_location)?;
 
         // Operation Workflow config
-        let operation_config =
-            OperationConfig::from_tedge_config(&mqtt_device_topic_id, tedge_config_location)?;
+        let operation_config = OperationConfig::from_tedge_config(
+            mqtt_topic_root.to_string(),
+            &mqtt_device_topic_id,
+            tedge_config_location,
+        )?;
 
         // For flockfile
         let run_dir = tedge_config.run.path.clone();

diff --git a/crates/core/tedge_agent/src/operation_workflows/config.rs b/crates/core/tedge_agent/src/operation_workflows/config.rs
@@ -13,13 +13,14 @@ pub struct OperationConfig {
 
 impl OperationConfig {
     pub fn from_tedge_config(
+        topic_root: String,
         device_topic_id: &EntityTopicId,
         tedge_config_location: &tedge_config::TEdgeConfigLocation,
     ) -> Result<OperationConfig, tedge_config::TEdgeConfigError> {
         let tedge_config = tedge_config::TEdgeConfig::try_new(tedge_config_location.clone())?;
 
         Ok(OperationConfig {
-            mqtt_schema: MqttSchema::with_root(tedge_config.mqtt.topic_root.clone()),
+            mqtt_schema: MqttSchema::with_root(topic_root),
             device_topic_id: device_topic_id.clone(),
             log_dir: tedge_config.logs.path.join("agent"),
             config_dir: tedge_config_location.tedge_config_root_path.clone(),

diff --git a/tests/RobotFramework/tests/tedge_agent/tedge_agent_as_child.robot b/tests/RobotFramework/tests/tedge_agent/tedge_agent_as_child.robot
@@ -0,0 +1,23 @@
+*** Settings ***
+Resource            ../../resources/common.resource
+Library    ThinEdgeIO
+
+Test Tags           theme:tedge_agent
+Test Setup          Custom Setup
+Test Teardown       Get Logs
+
+*** Test Cases ***
+
+Run agent with a custom topic prefix #3031
+    # Only run tedge-agent for a few seconds
+    ${output}=    Execute Command    timeout 5 tedge-agent --mqtt-topic-root "custom_root" --mqtt-device-topic-id "device/customname//" 2>&1    ignore_exit_code=${True}
+    Should Not Contain    ${output}    te/
+    Should Contain    ${output}    custom_root/device/customname//
+
+
+*** Keywords ***
+
+Custom Setup
+    ${DEVICE_SN}=    Setup    skip_bootstrap=${True}
+     Execute Command    test -f ./bootstrap.sh && ./bootstrap.sh --no-connect
+    Set Suite Variable    $DEVICE_SN