Merge pull request #3344 from didier-wenzek/test/entity-registration

Testing device registration using random walk

Author: didier-wenzek

Cargo.lock

@@ -155,6 +155,7 @@ rand = "0.8"
 rcgen = { version = "0.12", features = ["pem", "zeroize"] }
 regex = "1.4"
 reqwest = { version = "0.12", default-features = false }
+ron = "0.8"
 rpassword = "5.0"
 rstest = "0.16.0"
 rumqttc = { git = "https://github.com/jarhodes314/rumqtt", rev = "8c489faf6af910956c97b55587ff3ecb2ac4e96f" }

Cargo.toml

@@ -58,7 +58,9 @@ assert-json-diff = { workspace = true }
 axum_tls = { workspace = true, features = ["test-helpers"] }
 bytes = { workspace = true }
 http-body = { workspace = true }
+proptest = { workspace = true }
 rcgen = { workspace = true }
+ron = { workspace = true }
 rustls-pemfile = { workspace = true }
 tedge_actors = { workspace = true, features = ["test-helpers"] }
 tedge_mqtt_ext = { workspace = true, features = ["test-helpers"] }

crates/core/tedge_agent/Cargo.toml

@@ -0,0 +1,11 @@
+# Seeds for failure cases proptest has generated in the past. It is
+# automatically read and these particular cases re-run before any
+# novel cases are generated.
+#
+# It is recommended to check this file in to source control so that
+# everyone who runs the test benefits from these saved cases.
+cc eb284ae3160cf4a071a3ca80175b2c72680b7c8ba19b8d577805ef1317eca2db # shrinks to registrations = tedge mqtt pub -r te/device/a/service/c '{"@parent":"device/a//","@type":"service"}' && tedge mqtt pub -r te/device/a/service/c '{"@parent":"device/a//","@type":"service"}' && tedge mqtt pub -r te/device/ac// '{"@parent":"device/a//","@type":"child-device"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/a//","@topic-id":"device/a/service/c","@type":"service","x":"4"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/a//","@type":"child-device"}'
+cc 6e3a5e19daf6c3a4732a0504822f2164c5d0f49ed5652e1e67c779a23aedbe77 # shrinks to registrations = tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/main/service/a","@type":"service"}' && tedge mqtt pub -r te/device/abc// '{"@parent":"device/ab//","@type":"child-device","z":"0"}' && tedge mqtt pub -r te/device/abc// '{"@parent":"device/ab//","@type":"child-device","z":"8"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/a//","@topic-id":"device/a/service/a","@type":"service"}' && tedge mqtt pub -r te/device/abc// '{"@parent":"device/ab//","@type":"child-device","y":"3"}' && tedge mqtt pub -r te/device/ab// '{"@parent":"device/a//","@type":"child-device"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/main/service/a","@type":"service"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/ab//","@topic-id":"device/abc//","@type":"child-device","y":"7"}' && tedge mqtt pub -r te/device/a// '{"@parent":"device/main//","@type":"child-device"}'
+cc aa8e0b76fd3142bf3cd1df1f453a4468defd437111b406887d760f68d84ad5c3 # shrinks to registrations = tedge http delete /tedge/entity-store/v1/entities/device/a// && tedge http delete /tedge/entity-store/v1/entities/device/main/service/a && tedge mqtt pub -r te/device/main/service/a '{"@parent":"device/main//","@type":"service","z":"1"}' && tedge http delete /tedge/entity-store/v1/entities/device/main/service/a && tedge mqtt pub -r te/device/ab// '' && tedge mqtt pub -r te/device/a// '' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/a//","@type":"child-device"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/a//","@type":"child-device"}' && tedge mqtt pub -r te/device/a// '{"@parent":"device/main//","@type":"child-device","z":"4"}' 
+cc 758d928d082b3dcf1091381c5079eb67097a3128d5185923bd25be490af4980d # shrinks to registrations = tedge mqtt pub -r te/device/main/service/b '{"@parent":"device/main//","@type":"service","z":"6"}' && tedge http delete /tedge/entity-store/v1/entities/device/b// && tedge mqtt pub -r te/device/main/service/b '' && tedge mqtt pub -r te/device/main/service/b '' && tedge mqtt pub -r te/device/b// '{"@parent":"device/main//","@type":"child-device","z":"4"}' && tedge mqtt pub -r te/device/b// '' && tedge mqtt pub -r te/device/b// '' && tedge mqtt pub -r te/device/b// '' && tedge mqtt pub -r te/device/b// '{"@parent":"device/main//","@type":"child-device","y":"7"}' && tedge mqtt pub -r te/device/main/service/b '' 
+cc 8566571d898d3309d89053873256baa6ca3e459ae65f679c95d5883632531e4b # shrinks to registrations = tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/main/service/a","@type":"service","y":"5"}' && tedge mqtt pub -r te/device/main/service/b '{"@parent":"device/main//","@type":"service"}' && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/a//","@topic-id":"device/ac//","@type":"child-device"}' && tedge mqtt pub -r te/device/ac// '{"@parent":"device/a//","@type":"child-device"}' && tedge http delete /tedge/entity-store/v1/entities/device/ac// && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/a//","@type":"child-device","z":"0"}' && tedge http delete /tedge/entity-store/v1/entities/device/a// && tedge http delete /tedge/entity-store/v1/entities/device/main/service/a && tedge http post /tedge/entity-store/v1/entities '{"@parent":"device/main//","@topic-id":"device/a//","@type":"child-device","x":"5"}' 

crates/core/tedge_agent/proptest-regressions/entity_manager/tests.txt

@@ -1 +1,4 @@
 pub(crate) mod server;
+
+#[cfg(test)]
+mod tests;

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

@@ -57,6 +57,16 @@ impl EntityStoreServer {
             entity_auto_register,
         }
     }
+
+    #[cfg(test)]
+    pub fn entity_topic_ids(&self) -> impl Iterator<Item = &EntityTopicId> {
+        self.entity_store.entity_topic_ids()
+    }
+
+    #[cfg(test)]
+    pub fn get(&self, entity_topic_id: &EntityTopicId) -> Option<&EntityMetadata> {
+        self.entity_store.get(entity_topic_id)
+    }
 }
 
 #[async_trait]
@@ -100,7 +110,7 @@ impl EntityStoreServer {
     async fn process_mqtt_message(&mut self, message: MqttMessage) {
         if let Ok((topic_id, channel)) = self.mqtt_schema.entity_channel_of(&message.topic) {
             if let Channel::EntityMetadata = channel {
-                self.process_entity_registration(message);
+                self.process_entity_registration(topic_id, message).await;
             } else {
                 self.process_entity_data(topic_id).await;
             }
@@ -109,9 +119,9 @@ impl EntityStoreServer {
         }
     }
 
-    fn process_entity_registration(&mut self, message: MqttMessage) {
+    async fn process_entity_registration(&mut self, topic_id: EntityTopicId, message: MqttMessage) {
         if message.payload().is_empty() {
-            // Nothing to do on entity clear messages
+            let _ = self.deregister_entity(topic_id).await;
             return;
         }