Merge pull request #3700 from albinsuresh/fix/clear-health-status-on-entity-deregister

fix: clear health status on entity deregister

Author: albinsuresh

crates/core/tedge_agent/src/entity_manager/server.rs

@@ -328,6 +328,7 @@ impl EntityStoreServer {
                 ChannelFilter::EntityTwinData,
                 ChannelFilter::AnyCommand,
                 ChannelFilter::AnyCommandMetadata,
+                ChannelFilter::Health,
             ] {
                 let topic = self
                     .mqtt_schema

crates/core/tedge_agent/src/entity_manager/tests.rs

@@ -124,6 +124,11 @@ async fn delete_entity_clears_retained_data() {
             json!({"status": "init"}),
             true,
         ),
+        (
+            "te/device/child0///status/health",
+            json!({"status": "up"}),
+            true,
+        ),
     ] {
         mqtt_sender
             .send(MqttMessage::from((topic, &payload.to_string())).with_retain_flag(retain))
@@ -144,6 +149,7 @@ async fn delete_entity_clears_retained_data() {
             MqttMessage::from(("te/device/child0///a/high_temp", "")).with_retain(),
             MqttMessage::from(("te/device/child0///cmd/restart", "")).with_retain(),
             MqttMessage::from(("te/device/child0///cmd/restart/123", "")).with_retain(),
+            MqttMessage::from(("te/device/child0///status/health", "")).with_retain(),
             MqttMessage::from(("te/device/child0//", "")).with_retain(),
         ])
         .await;

tests/RobotFramework/tests/tedge_agent/http_server/entity_store_api.robot

@@ -513,9 +513,9 @@ Delete entity clears entity registration and all retained data messages
 
     ${deleted}=    Deregister Entity    device/child0//
 
-    Should Not Have Retained MQTT Messages    te/device/child000//#
-    Should Not Have Retained MQTT Messages    te/device/child00//#
-    Should Not Have Retained MQTT Messages    te/device/child0//#
+    Should Not Have Retained MQTT Messages    te/device/child000/#
+    Should Not Have Retained MQTT Messages    te/device/child00/#
+    Should Not Have Retained MQTT Messages    te/device/child0/#
 
 
 *** Keywords ***