Add ParentPool struct

To pass around both pool object path and pool UUID together.

Signed-off-by: mulhern <[email protected]>

Author: mulkieran

src/dbus/blockdev/mod.rs

@@ -12,8 +12,8 @@ use tokio::sync::RwLock;
 use zbus::{zvariant::ObjectPath, Connection};
 
 use crate::{
-    dbus::{consts, Manager},
-    engine::{DevUuid, Engine, Lockable, PoolUuid},
+    dbus::{consts, Manager, ParentPool},
+    engine::{DevUuid, Engine, Lockable},
     stratis::StratisResult,
 };
 
@@ -45,7 +45,7 @@ pub async fn register_blockdev<'a>(
     connection: &Arc<Connection>,
     manager: &Lockable<Arc<RwLock<Manager>>>,
     counter: &Arc<AtomicU64>,
-    pool_uuid: PoolUuid,
+    pool: ParentPool<'a>,
     dev_uuid: DevUuid,
 ) -> StratisResult<ObjectPath<'a>> {
     let path = ObjectPath::try_from(format!(
@@ -57,79 +57,79 @@ pub async fn register_blockdev<'a>(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR1::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR2::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR3::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR4::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR5::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR6::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR7::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR8::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;
     BlockdevR9::register(
         engine.clone(),
         connection,
         path.clone(),
-        pool_uuid,
+        pool.uuid,
         dev_uuid,
     )
     .await?;

src/dbus/mod.rs

@@ -10,6 +10,7 @@ use zbus::{connection::Builder, Connection};
 pub use crate::dbus::{
     blockdev::register_blockdev,
     manager::Manager,
+    types::ParentPool,
     udev::UdevHandler,
     util::{send_fs_background_signals, send_pool_background_signals},
 };

src/dbus/pool/mod.rs

@@ -11,7 +11,7 @@ use tokio::sync::RwLock;
 use zbus::{zvariant::ObjectPath, Connection};
 
 use crate::{
-    dbus::{consts, register_blockdev, Manager},
+    dbus::{consts, register_blockdev, Manager, ParentPool},
     engine::{Engine, Lockable, PoolIdentifier, PoolUuid},
     stratis::{StratisError, StratisResult},
 };
@@ -52,7 +52,7 @@ pub async fn register_pool<'a>(
             let mut bd_paths = Vec::new();
             let bd_uuids = pool.blockdevs().into_iter().map(|(u, _, _)| u).collect::<Vec<_>>();
             for dev_uuid in bd_uuids {
-                match register_blockdev(engine, connection, manager, counter, pool_uuid, dev_uuid).await {
+                match register_blockdev(engine, connection, manager, counter, ParentPool { object_path: path.clone(), uuid: pool_uuid}, dev_uuid).await {
                     Ok(op) => bd_paths.push(op),
                     Err(_) => {
                         warn!("Unable to register object path for blockdev with UUID {dev_uuid} belonging to pool {pool_uuid} on the D-Bus");

src/dbus/types.rs

@@ -4,7 +4,7 @@
 
 use std::collections::HashMap;
 
-use zbus::zvariant::{signature::Child, Basic, Dict, Signature, Type, Value};
+use zbus::zvariant::{signature::Child, Basic, Dict, ObjectPath, Signature, Type, Value};
 
 use crate::{
     dbus::util::result_option_to_tuple,
@@ -279,3 +279,24 @@ impl Basic for PoolUuid {
     const SIGNATURE_CHAR: char = 's';
     const SIGNATURE_STR: &str = "s";
 }
+
+pub struct ParentPool<'a> {
+    pub object_path: ObjectPath<'a>,
+    pub uuid: PoolUuid,
+}
+
+#[allow(dead_code)]
+pub struct OwnedParentPool {
+    object_path: String,
+    uuid: PoolUuid,
+}
+
+impl ParentPool<'_> {
+    #[allow(dead_code)]
+    pub fn to_owned(&self) -> OwnedParentPool {
+        OwnedParentPool {
+            object_path: self.object_path.to_string(),
+            uuid: self.uuid,
+        }
+    }
+}