fix: Capability message for firmware_update workflow

albinsuresh · albinsuresh · commit d2c2cffbd92f · 2024-10-01T12:38:30.000Z
diff --git a/crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs b/crates/common/tedge_config/src/tedge_config_cli/tedge_config.rs
@@ -511,7 +511,7 @@ define_tedge_config! {
             config_update: bool,
 
             /// Enable firmware_update feature
-            #[tedge_config(example = "true", default(value = false))]
+            #[tedge_config(example = "true", default(value = true))]
             firmware_update: bool,
 
             /// Enable device_profile feature
diff --git a/crates/core/tedge_api/src/workflow/mod.rs b/crates/core/tedge_api/src/workflow/mod.rs
@@ -308,7 +308,10 @@ impl OperationWorkflow {
     ) -> Option<MqttMessage> {
         match self.operation {
             // Custom operations (and restart) have a generic empty capability message
-            OperationType::Custom(_) | OperationType::Restart | OperationType::DeviceProfile => {
+            OperationType::Custom(_)
+            | OperationType::Restart
+            | OperationType::DeviceProfile
+            | OperationType::FirmwareUpdate => {
                 let meta_topic = schema.capability_topic_for(target, self.operation.clone());
                 let payload = "{}".to_string();
                 Some(
@@ -319,7 +322,12 @@ impl OperationWorkflow {
             }
             // Builtin operations dynamically publish their capability message,
             // notably to include a list of supported types.
-            _ => None,
+            OperationType::SoftwareList
+            | OperationType::SoftwareUpdate
+            | OperationType::LogUpload
+            | OperationType::ConfigSnapshot
+            | OperationType::ConfigUpdate
+            | OperationType::Health => None,
         }
     }
 
diff --git a/tests/RobotFramework/tests/cumulocity/firmware/firmware_operation.robot b/tests/RobotFramework/tests/cumulocity/firmware/firmware_operation.robot
@@ -6,29 +6,23 @@ Library             ThinEdgeIO
 Test Setup          Custom Setup
 Test Teardown       Get Logs
 
-Test Tags           theme:c8y    theme:firmware    theme:plugins
+Test Tags           theme:c8y    theme:firmware
 
 
 *** Test Cases ***
-Successful firmware operation
-    ${operation}=    Cumulocity.Install Firmware    ubuntu    1.0.2    https://dummy.url/firmware.zip
-    ${operation}=    Cumulocity.Operation Should Be SUCCESSFUL    ${operation}    timeout=120
-    Device Should Have Firmware    ubuntu    1.0.2    https://dummy.url/firmware.zip
-
-Install with empty firmware name
-    ${operation}=    Cumulocity.Install Firmware    ${EMPTY}    1.0.2    https://dummy.url/firmware.zip
-    Operation Should Be FAILED
-    ...    ${operation}
-    ...    failure_reason=.*Invalid firmware name. Firmware name cannot be empty
-    ...    timeout=120
+Send firmware update operation from Cumulocity IoT
+    Should Have MQTT Messages    te/device/main///cmd/firmware_update    message_pattern=^\{\}$
+    Cumulocity.Should Contain Supported Operations    c8y_Firmware
 
+    ${operation}=    Cumulocity.Install Firmware    tedge-core    1.0.0    https://abc.com/some/firmware/url
+    ${operation}=    Cumulocity.Operation Should Be SUCCESSFUL    ${operation}
+    Cumulocity.Device Should Have Firmware    tedge-core    1.0.0    https://abc.com/some/firmware/url
 
 *** Keywords ***
 Custom Setup
     ${DEVICE_SN}=    Setup
     Set Suite Variable    $DEVICE_SN
     Device Should Exist    ${DEVICE_SN}
-    ThinEdgeIO.Transfer To Device    ${CURDIR}/firmware_handler.*    /etc/tedge/operations/
-    ThinEdgeIO.Transfer To Device    ${CURDIR}/c8y_Firmware*    /etc/tedge/operations/c8y/
-    ThinEdgeIO.Restart Service    tedge-agent
-    ThinEdgeIO.Disconnect Then Connect Mapper    c8y
+
+    ThinEdgeIO.Transfer To Device    ${CURDIR}/firmware_update.toml    /etc/tedge/operations/
+    Restart Service    tedge-agent
diff --git a/tests/RobotFramework/tests/cumulocity/firmware/firmware_update.toml b/tests/RobotFramework/tests/cumulocity/firmware/firmware_update.toml
@@ -0,0 +1,36 @@
+operation = "firmware_update"
+
+[init]
+action = "proceed"
+on_success = "scheduled"
+
+[scheduled]
+script = "/usr/bin/sleep 1"
+on_success = "executing"
+
+[executing]
+script = "/usr/bin/sleep 1"
+on_success = "restart"
+
+[restart]
+operation = "restart"
+on_exec = "waiting_for_restart"
+
+[waiting_for_restart]
+action = "await-operation-completion"
+on_success = "verify"
+on_error = { status = "failed", reason = "fail to restart"}
+
+[verify]
+script = "/usr/bin/sleep 1"
+on_success = "commit"
+
+[commit]
+script = "/usr/bin/sleep 1"
+on_success = "successful"
+
+[successful]
+action = "cleanup"
+
+[failed]
+action = "cleanup"
