Mount udev devpath in Akri brokers (#534)

* Mount udev devpath in Akri brokers Signed-off-by: Kate Goldenring <[email protected]> * Update minor version Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Signed-off-by: Kate Goldenring <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
project-akri · Dec 7, 2022 · 2efb89e · 2efb89e
1 parent 6a2ba06
commit 2efb89e
Show file tree

Hide file tree

Showing 20 changed files with 59 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["<[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.8.27
+version: 0.9.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.8.27
+appVersion: 0.9.0
diff --git a/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml b/discovery-handler-modules/debug-echo-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "debug-echo-discovery-handler"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handler-modules/onvif-discovery-handler/Cargo.toml b/discovery-handler-modules/onvif-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "onvif-discovery-handler"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handler-modules/opcua-discovery-handler/Cargo.toml b/discovery-handler-modules/opcua-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "opcua-discovery-handler"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handler-modules/udev-discovery-handler/Cargo.toml b/discovery-handler-modules/udev-discovery-handler/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-discovery-handler"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-debug-echo"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handlers/onvif/Cargo.toml b/discovery-handlers/onvif/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-onvif"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-opcua"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handlers/udev/Cargo.toml b/discovery-handlers/udev/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-udev"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/discovery-handlers/udev/src/discovery_handler.rs b/discovery-handlers/udev/src/discovery_handler.rs
@@ -1,4 +1,7 @@
-use super::{discovery_impl::do_parse_and_find, wrappers::udev_enumerator};
+use super::{
+    discovery_impl::{do_parse_and_find, DeviceProperties},
+    wrappers::udev_enumerator,
+};
 use akri_discovery_utils::discovery::{
     discovery_handler::{deserialize_discovery_details, DISCOVERED_DEVICES_CHANNEL_CAPACITY},
     v0::{
@@ -65,7 +68,7 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
                     }
                     break;
                 }
-                let mut devpaths: HashSet<String> = HashSet::new();
+                let mut devpaths: HashSet<DeviceProperties> = HashSet::new();
                 udev_rules.iter().for_each(|rule| {
                     let enumerator = udev_enumerator::create_enumerator();
                     let paths = do_parse_and_find(enumerator, rule).unwrap();
@@ -79,9 +82,12 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
                 );
                 let discovered_devices = devpaths
                     .into_iter()
-                    .map(|path| {
+                    .map(|(path, node)| {
                         let mut properties = std::collections::HashMap::new();
-                        properties.insert(super::UDEV_DEVNODE_LABEL_ID.to_string(), path.clone());
+                        if let Some(devnode) = node {
+                            properties.insert(super::UDEV_DEVNODE_LABEL_ID.to_string(), devnode);
+                        }
+                        properties.insert(super::UDEV_DEVPATH_LABEL_ID.to_string(), path.clone());
                         let mount = Mount {
                             container_path: path.clone(),
                             host_path: path.clone(),

diff --git a/discovery-handlers/udev/src/discovery_impl.rs b/discovery-handlers/udev/src/discovery_impl.rs
@@ -23,18 +23,21 @@ pub struct UdevFilter<'a> {
     value: String,
 }
 
+/// A udev device is defined by its devpath and devnode (if exists)
+pub(crate) type DeviceProperties = (String, Option<String>);
+
 /// This parses the udev rule into UdevFilters and finds all devices that match those filters
 pub fn do_parse_and_find(
     enumerator: impl Enumerator,
     udev_rule_string: &str,
-) -> Result<Vec<String>, anyhow::Error> {
+) -> Result<Vec<DeviceProperties>, anyhow::Error> {
     let udev_filters = parse_udev_rule(udev_rule_string)?;
-    let devpaths = find_devices(enumerator, udev_filters)?;
+    let devices = find_devices(enumerator, udev_filters)?;
     trace!(
         "do_parse_and_find - returning discovered devices with devpaths: {:?}",
-        devpaths
+        devices
     );
-    Ok(devpaths)
+    Ok(devices)
 }
 
 /// This parses a udev rule and returns a list of UdevFilter objects that specify which devices to search for.
@@ -103,7 +106,7 @@ fn parse_udev_rule(udev_rule_string: &str) -> Result<Vec<UdevFilter>, anyhow::Er
 fn find_devices(
     enumerator: impl Enumerator,
     udev_filters: Vec<UdevFilter>,
-) -> std::io::Result<Vec<String>> {
+) -> std::io::Result<Vec<DeviceProperties>> {
     let mut enumerator = enumerator;
     trace!("find_devices - enter with udev_filters {:?}", udev_filters);
 
@@ -147,18 +150,13 @@ fn find_devices(
     let devices: Vec<udev::Device> = enumerator.scan_devices()?.collect();
     let final_devices = filter_by_remaining_udev_filters(devices, remaining_udev_filters);
 
-    let device_devpaths: Vec<String> = final_devices
+    let device_devpaths: Vec<DeviceProperties> = final_devices
         .into_iter()
-        .filter_map(|device| {
-            if let Some(devnode) = get_devnode(&device) {
-                Some(devnode.to_str().unwrap().to_string())
-            } else {
-                trace!(
-                    "find_devices - ignoring device with devpath {:?} due to having no devnode",
-                    get_devpath(&device)
-                );
-                None
-            }
+        .map(|device| {
+            (
+                get_devpath(&device).to_str().unwrap().to_string(),
+                get_devnode(&device).map(|devnode| devnode.to_str().unwrap().to_string()),
+            )
         })
         .collect();
 

diff --git a/discovery-handlers/udev/src/lib.rs b/discovery-handlers/udev/src/lib.rs
@@ -10,8 +10,11 @@ mod discovery_impl;
 mod wrappers;
 
 /// Name of environment variable that is set in udev brokers. Contains devnode for udev device
-/// the broker should connect to.
+/// the broker should use.
 pub const UDEV_DEVNODE_LABEL_ID: &str = "UDEV_DEVNODE";
+/// Name of environment variable that is set in udev brokers. Contains devpath for udev device
+/// the broker should connect to.
+pub const UDEV_DEVPATH_LABEL_ID: &str = "UDEV_DEVPATH";
 /// Name that udev discovery handlers use when registering with the Agent
 pub const DISCOVERY_HANDLER_NAME: &str = "udev";
 /// Defines whether this discovery handler discovers local devices on nodes rather than ones visible to multiple nodes

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/samples/brokers/udev-video-broker/Cargo.toml b/samples/brokers/udev-video-broker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "udev-video-broker"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-shared"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["<[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.8.27
+0.9.0
diff --git a/webhooks/validating/configuration/Cargo.toml b/webhooks/validating/configuration/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webhook-configuration"
-version = "0.8.27"
+version = "0.9.0"
 authors = ["DazWilkin <[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"