From afe12527c0bf501f745d84dec223c83a7368f1da Mon Sep 17 00:00:00 2001 From: Diwakar Sharma Date: Wed, 12 Feb 2025 05:59:10 +0000 Subject: [PATCH] chore: scaffold for new pool API Signed-off-by: Diwakar Sharma --- io-engine-tests/src/pool.rs | 1 + io-engine/src/bin/io-engine-client/v1/pool_cli.rs | 2 ++ io-engine/tests/nexus_with_local.rs | 1 + io-engine/tests/nvmf.rs | 1 + io-engine/tests/snapshot_nexus.rs | 1 + utils/dependencies | 2 +- 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/io-engine-tests/src/pool.rs b/io-engine-tests/src/pool.rs index f833f118f..31aa73e24 100644 --- a/io-engine-tests/src/pool.rs +++ b/io-engine-tests/src/pool.rs @@ -195,6 +195,7 @@ impl PoolBuilderRpc { disks: vec![self.bdev.as_ref().unwrap().clone()], cluster_size: None, md_args: None, + encryption: None, }) .await .map(|r| r.into_inner()) diff --git a/io-engine/src/bin/io-engine-client/v1/pool_cli.rs b/io-engine/src/bin/io-engine-client/v1/pool_cli.rs index e68bef2ab..3a2fdfbff 100644 --- a/io-engine/src/bin/io-engine-client/v1/pool_cli.rs +++ b/io-engine/src/bin/io-engine-client/v1/pool_cli.rs @@ -261,6 +261,7 @@ async fn create(mut ctx: Context, matches: &ArgMatches) -> crate::Result<()> { pooltype: v1rpc::pool::PoolType::from(pooltype) as i32, cluster_size, md_args: Some(v1rpc::pool::PoolMetadataArgs { md_resv_ratio }), + encryption: None, }) .await .context(GrpcStatus)?; @@ -333,6 +334,7 @@ async fn import(mut ctx: Context, matches: &ArgMatches) -> crate::Result<()> { uuid: uuid.map(ToString::to_string), disks: disks_list, pooltype: v1rpc::pool::PoolType::from(pooltype) as i32, + encryption: None, }) .await .context(GrpcStatus)?; diff --git a/io-engine/tests/nexus_with_local.rs b/io-engine/tests/nexus_with_local.rs index ab91b0c8d..6883b6ba1 100644 --- a/io-engine/tests/nexus_with_local.rs +++ b/io-engine/tests/nexus_with_local.rs @@ -46,6 +46,7 @@ async fn create_replicas(h: &mut RpcHandle) { disks: vec!["malloc:///disk0?size_mb=64".into()], cluster_size: None, md_args: None, + encryption: None, }) .await .unwrap(); diff --git a/io-engine/tests/nvmf.rs b/io-engine/tests/nvmf.rs index 8df8d9355..8bd85ca9d 100644 --- a/io-engine/tests/nvmf.rs +++ b/io-engine/tests/nvmf.rs @@ -260,6 +260,7 @@ async fn test_rdma_target() { disks: vec!["malloc:///disk0?size_mb=100".into()], cluster_size: None, md_args: None, + encryption: None, }) .await .unwrap(); diff --git a/io-engine/tests/snapshot_nexus.rs b/io-engine/tests/snapshot_nexus.rs index 7b3feff57..cc9efdb47 100755 --- a/io-engine/tests/snapshot_nexus.rs +++ b/io-engine/tests/snapshot_nexus.rs @@ -129,6 +129,7 @@ async fn launch_instance(create_replicas: bool) -> (ComposeTest, Vec) { disks: vec!["malloc:///disk0?size_mb=128".into()], cluster_size: None, md_args: None, + encryption: None, }) .await .unwrap(); diff --git a/utils/dependencies b/utils/dependencies index 0722218cb..a6af0834a 160000 --- a/utils/dependencies +++ b/utils/dependencies @@ -1 +1 @@ -Subproject commit 0722218cb0536bb4c90c4b680a12ead4c6d8ce7a +Subproject commit a6af0834a2de65a4a78e62e26822876f70e56b01