Send *Statistics and Timestamp messages from SimulatedMessageBridge
This makes the simulation environment much closer to reality.
Change-Id: Ie0f44c17d9c9a750363335def1b008cef8c809b0
diff --git a/aos/events/event_loop_param_test.h b/aos/events/event_loop_param_test.h
index faf6361..57d0525 100644
--- a/aos/events/event_loop_param_test.h
+++ b/aos/events/event_loop_param_test.h
@@ -103,16 +103,60 @@
static const std::string kJson = R"config({
"channels": [
{
- "name": "/aos/me",
+ "name": "/me/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "me"
},
{
- "name": "/aos/them",
+ "name": "/them/aos",
"type": "aos.logging.LogMessageFbs",
"source_node": "them"
},
{
+ "name": "/me/aos",
+ "type": "aos.message_bridge.Timestamp",
+ "source_node": "me",
+ "destination_nodes": [
+ {
+ "name": "them"
+ }
+ ]
+ },
+ {
+ "name": "/them/aos",
+ "type": "aos.message_bridge.Timestamp",
+ "source_node": "them",
+ "destination_nodes": [
+ {
+ "name": "me"
+ }
+ ]
+ },
+ {
+ "name": "/me/aos",
+ "type": "aos.message_bridge.ServerStatistics",
+ "source_node": "me",
+ "frequency": 2
+ },
+ {
+ "name": "/them/aos",
+ "type": "aos.message_bridge.ServerStatistics",
+ "source_node": "them",
+ "frequency": 2
+ },
+ {
+ "name": "/me/aos",
+ "type": "aos.message_bridge.ClientStatistics",
+ "source_node": "me",
+ "frequency": 2
+ },
+ {
+ "name": "/them/aos",
+ "type": "aos.message_bridge.ClientStatistics",
+ "source_node": "them",
+ "frequency": 2
+ },
+ {
"name": "/aos",
"type": "aos.timing.Report",
"source_node": "me"
@@ -146,29 +190,28 @@
"maps": [
{
"match": {
- "name": "/aos",
- "type": "aos.logging.LogMessageFbs",
+ "name": "/aos*",
"source_node": "me"
},
"rename": {
- "name": "/aos/me"
+ "name": "/me/aos"
}
},
{
"match": {
- "name": "/aos",
- "type": "aos.logging.LogMessageFbs",
+ "name": "/aos*",
"source_node": "them"
},
"rename": {
- "name": "/aos/them"
+ "name": "/them/aos"
}
}
]
})config";
- flatbuffer_ = FlatbufferDetachedBuffer<Configuration>(
- JsonToFlatbuffer(kJson, Configuration::MiniReflectTypeTable()));
+ flatbuffer_ = configuration::MergeConfiguration(
+ FlatbufferDetachedBuffer<Configuration>(
+ JsonToFlatbuffer(kJson, Configuration::MiniReflectTypeTable())));
my_node_ = configuration::GetNode(&flatbuffer_.message(), my_node);
}