Merge pull request #576 from diconico07/use-device-specs

udev: Use device specs instead of mounts
project-akri · Apr 12, 2023 · b62cf5e · b62cf5e
2 parents e342352 + f0b45f8
commit b62cf5e
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 38 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1
+version: 0.10.2
 
 # 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.10.1
+appVersion: 0.10.2
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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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
@@ -5,8 +5,8 @@ use super::{
 use akri_discovery_utils::discovery::{
     discovery_handler::{deserialize_discovery_details, DISCOVERED_DEVICES_CHANNEL_CAPACITY},
     v0::{
-        discovery_handler_server::DiscoveryHandler, Device, DiscoverRequest, DiscoverResponse,
-        Mount,
+        discovery_handler_server::DiscoveryHandler, Device, DeviceSpec, DiscoverRequest,
+        DiscoverResponse,
     },
     DiscoverStream,
 };
@@ -104,7 +104,7 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
                     .into_iter()
                     .map(|(id, paths)| {
                         let mut properties = HashMap::new();
-                        let mut mounts = Vec::new();
+                        let mut device_specs = Vec::new();
                         for (i, (_, node)) in paths.into_iter().enumerate() {
                             let property_suffix = discovery_handler_config
                                 .group_recursive
@@ -115,10 +115,10 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
                                     super::UDEV_DEVNODE_LABEL_ID.to_string() + &property_suffix,
                                     devnode.clone(),
                                 );
-                                mounts.push(Mount {
+                                device_specs.push(DeviceSpec {
                                     container_path: devnode.clone(),
                                     host_path: devnode,
-                                    read_only: true,
+                                    permissions: "rwm".to_string(),
                                 })
                             }
                         }
@@ -130,8 +130,8 @@ impl DiscoveryHandler for DiscoveryHandlerImpl {
                         Device {
                             id,
                             properties,
-                            mounts,
-                            device_specs: Vec::default(),
+                            mounts: Vec::default(),
+                            device_specs,
                         }
                     })
                     .collect::<Vec<Device>>();

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "akri-discovery-utils"
-version = "0.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 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.10.1"
+version = "0.10.2"
 authors = ["<[email protected]>"]
 edition = "2018"
 rust-version = "1.63.0"

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