Add mqtt-zenoh reference implementation and mqtt example entities

.cargo/config.toml

@@ -0,0 +1,6 @@
+[env]
+VSOMEIP_INSTALL_PATH="/usr/local/lib"
+GENERIC_CPP_STDLIB_PATH="/usr/include/c++/11"
+ARCH_SPECIFIC_CPP_STDLIB_PATH="/usr/include/x86_64-linux-gnu/c++/11"
+OPENSSLDIR="/usr/lib/ssl"
+RUST_LOG="info"

Cargo.toml

@@ -15,7 +15,7 @@ members = [
     "example-streamer-uses",
     "utils/hello-world-protos",
     "utils/integration-test-utils",
-    "up-linux-streamer", "up-linux-streamer-plugin",
+    "example-streamer-implementations", "up-linux-streamer-plugin",
     "up-streamer", "subscription-cache", "utils/usubscription-static-file"]
 
 [workspace.package]
@@ -44,6 +44,7 @@ protobuf = { version = "3.3", features = ["with-bytes"] }
 up-rust = { version = "0.2.0", default-features = false }
 up-transport-zenoh = { version = "0.3.0" }
 up-transport-vsomeip = { git = "https://github.com/eclipse-uprotocol/up-transport-vsomeip-rust.git", tag = "v0.3.0", default-features = false }
+up-client-mqtt5-rust = { git = "https://github.com/eclipse-uprotocol/up-transport-mqtt5-rust.git", tag = "v0.1.0"}
 zenoh = { version = "1.0.0", features = ["default", "plugins"] }
 zenoh-core = { version = "1.0.0" }
 zenoh-plugin-trait = { version = "1.0.0" }

up-linux-streamer/Cargo.toml → example-streamer-implementations/Cargo.toml

@@ -20,13 +20,17 @@ keywords.workspace = true
 license.workspace = true
 
 [[bin]]
-name = "up-linux-streamer"
-path = "src/main.rs"
+name = "zenoh_someip"
 required-features = ["zenoh-transport", "vsomeip-transport"]
 
+[[bin]]
+name = "zenoh_mqtt"
+required-features = ["zenoh-transport", "mqtt-transport"]
+
 [features]
 default = []
 zenoh-transport = ["up-transport-zenoh", "zenoh"]
+mqtt-transport = ["up-client-mqtt5-rust"]
 vsomeip-transport = ["up-transport-vsomeip"]
 bundled-vsomeip = ["up-transport-vsomeip/bundled"]
 
@@ -44,6 +48,7 @@ up-rust = { workspace = true }
 up-streamer = { path = "../up-streamer" }
 up-transport-zenoh = { workspace = true, optional = true }
 up-transport-vsomeip = { workspace = true, optional = true }
+up-client-mqtt5-rust = { workspace = true, optional = true }
 zenoh = { workspace = true, optional = true }
 usubscription-static-file = {path = "../utils/usubscription-static-file"}
 

up-linux-streamer/DEFAULT_CONFIG.json5 → example-streamer-implementations/DEFAULT_CONFIG.json5

@@ -11,7 +11,7 @@
     streamer_uuri: {
       // Determines the authority_name of the host device
       // Used when initializing host transport
-      authority: "linux",
+      authority: "authority_B",
       // Determines the ue_id of the streamer
       // Used when initializing host transport
       ue_id: 78,
@@ -21,11 +21,11 @@
     },
     usubscription_config: {
       // Lists the path to the subscription file when using static file
-      file_path: "./utils/usubscription-static-file/static-configs/testdata.json"
+      file_path: "/home/ubuntu/up-streamer-rust/example-streamer-implementations/subscription_data.json"
     },
     zenoh_transport_config: {
       // Configuration file which is where zenoh config information is stored
-      config_file: "./up-linux-streamer/ZENOH_CONFIG.json5"
+      config_file: "/home/ubuntu/up-streamer-rust/example-streamer-implementations/ZENOH_CONFIG.json5"
     },
     // Configurations related to the host device we are running the streamer on
     host_config: {
@@ -35,7 +35,7 @@
     someip_config: {
       // Determines the authority_name of the mechatronics network
       // Used when initializing SOME/IP transport
-      authority: "me_authority",
+      authority: "authority_C",
       // The vsomeip configuration file to be used when initializing the vsomeip transport
       //
       // Some guidance:
@@ -46,11 +46,9 @@
       //     called
       //   * the `id` field should be chosen such that it matches the ue_id of the uE on the host
       //     device
-      config_file: "../../up-linux-streamer/vsomeip-configs/point_to_point.json",
+      config_file: "/home/ubuntu/up-streamer-rust/example-streamer-implementations/vsomeip-configs/point_to_point.json",
       // An ID to use for a vsomeip application which will represent all subscriptions to
       // publish messages output over vsomeip
-      default_someip_application_id_for_someip_subscriptions: 10,
-      // Whether to enable bridging across to the mechatronics network
-      enabled: true
+      default_someip_application_id_for_someip_subscriptions: 10
     },
 }

up-linux-streamer/src/config.rs → example-streamer-implementations/src/bin/config/mod.rs

@@ -63,7 +63,6 @@ pub struct SomeipConfig {
     pub(crate) authority: String,
     pub(crate) config_file: PathBuf,
     pub(crate) default_someip_application_id_for_someip_subscriptions: u16,
-    pub(crate) enabled: bool,
 }
 
 #[derive(Deserialize, Serialize, Debug, Clone)]