Skip to content

Commit c20b9f2

Browse files
mulkieranmulkieran
committed
destroy_filesystems: return String types for filesystem UUIDs
Signed-off-by: mulhern <[email protected]>
1 parent 36a2e24 commit c20b9f2

File tree

11 files changed

+31
-51
lines changed

11 files changed

+31
-51
lines changed

‎src/dbus/pool/pool_3_0/methods.rs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ use crate::{
3030
},
3131
},
3232
engine::{
33-
BlockDevTier, CreateAction, DeleteAction, Engine, EngineAction, FilesystemUuid,
34-
KeyDescription, Lockable, OptionalTokenSlotInput, PoolIdentifier, PoolUuid, RenameAction,
33+
BlockDevTier, CreateAction, DeleteAction, Engine, EngineAction, KeyDescription, Lockable,
34+
OptionalTokenSlotInput, PoolIdentifier, PoolUuid, RenameAction,
3535
},
3636
stratis::StratisError,
3737
};
@@ -142,7 +142,7 @@ pub async fn destroy_filesystems_method(
142142
manager: &Lockable<Arc<RwLock<Manager>>>,
143143
pool_uuid: PoolUuid,
144144
filesystems: Vec<ObjectPath<'_>>,
145-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
145+
) -> ((bool, Vec<String>), u16, String) {
146146
let default_return = (false, (Vec::new()));
147147

148148
let uuids = {
@@ -190,7 +190,14 @@ pub async fn destroy_filesystems_method(
190190
}
191191
}
192192
}
193-
((true, v), DbusErrorEnum::OK as u16, OK_STRING.to_string())
193+
(
194+
(
195+
true,
196+
v.into_iter().map(|u| u.simple().to_string()).collect(),
197+
),
198+
DbusErrorEnum::OK as u16,
199+
OK_STRING.to_string(),
200+
)
194201
}
195202
None => (
196203
default_return,

‎src/dbus/pool/pool_3_0/mod.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ use crate::{
2020
manager::Manager,
2121
pool::shared::{pool_prop, try_pool_prop},
2222
},
23-
engine::{
24-
self, ActionAvailability, Engine, FilesystemUuid, KeyDescription, Lockable, PoolUuid,
25-
},
23+
engine::{self, ActionAvailability, Engine, KeyDescription, Lockable, PoolUuid},
2624
stratis::StratisResult,
2725
};
2826

@@ -114,7 +112,7 @@ impl PoolR0 {
114112
async fn destroy_filesystems(
115113
&self,
116114
filesystems: Vec<ObjectPath<'_>>,
117-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
115+
) -> ((bool, Vec<String>), u16, String) {
118116
destroy_filesystems_method(
119117
&self.engine,
120118
&self.connection,

‎src/dbus/pool/pool_3_1/mod.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ use crate::{
3030
shared::{pool_prop, set_pool_prop, try_pool_prop},
3131
},
3232
},
33-
engine::{
34-
self, ActionAvailability, Engine, FilesystemUuid, KeyDescription, Lockable, PoolUuid,
35-
},
33+
engine::{self, ActionAvailability, Engine, KeyDescription, Lockable, PoolUuid},
3634
stratis::StratisResult,
3735
};
3836

@@ -117,7 +115,7 @@ impl PoolR1 {
117115
async fn destroy_filesystems(
118116
&self,
119117
filesystems: Vec<ObjectPath<'_>>,
120-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
118+
) -> ((bool, Vec<String>), u16, String) {
121119
destroy_filesystems_method(
122120
&self.engine,
123121
&self.connection,

‎src/dbus/pool/pool_3_2/mod.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ use crate::{
3434
shared::{pool_prop, set_pool_prop, try_pool_prop},
3535
},
3636
},
37-
engine::{
38-
self, ActionAvailability, Engine, FilesystemUuid, KeyDescription, Lockable, PoolUuid,
39-
},
37+
engine::{self, ActionAvailability, Engine, KeyDescription, Lockable, PoolUuid},
4038
stratis::StratisResult,
4139
};
4240

@@ -114,7 +112,7 @@ impl PoolR2 {
114112
async fn destroy_filesystems(
115113
&self,
116114
filesystems: Vec<ObjectPath<'_>>,
117-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
115+
) -> ((bool, Vec<String>), u16, String) {
118116
destroy_filesystems_method(
119117
&self.engine,
120118
&self.connection,

‎src/dbus/pool/pool_3_3/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ use crate::{
3434
shared::{pool_prop, set_pool_prop, try_pool_prop},
3535
},
3636
},
37-
engine::{
38-
self, ActionAvailability, DevUuid, Engine, FilesystemUuid, KeyDescription, Lockable,
39-
PoolUuid,
40-
},
37+
engine::{self, ActionAvailability, DevUuid, Engine, KeyDescription, Lockable, PoolUuid},
4138
stratis::StratisResult,
4239
};
4340

@@ -119,7 +116,7 @@ impl PoolR3 {
119116
async fn destroy_filesystems(
120117
&self,
121118
filesystems: Vec<ObjectPath<'_>>,
122-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
119+
) -> ((bool, Vec<String>), u16, String) {
123120
destroy_filesystems_method(
124121
&self.engine,
125122
&self.connection,

‎src/dbus/pool/pool_3_4/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ use crate::{
3535
shared::{pool_prop, set_pool_prop, try_pool_prop},
3636
},
3737
},
38-
engine::{
39-
self, ActionAvailability, DevUuid, Engine, FilesystemUuid, KeyDescription, Lockable,
40-
PoolUuid,
41-
},
38+
engine::{self, ActionAvailability, DevUuid, Engine, KeyDescription, Lockable, PoolUuid},
4239
stratis::StratisResult,
4340
};
4441

@@ -116,7 +113,7 @@ impl PoolR4 {
116113
async fn destroy_filesystems(
117114
&self,
118115
filesystems: Vec<ObjectPath<'_>>,
119-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
116+
) -> ((bool, Vec<String>), u16, String) {
120117
destroy_filesystems_method(
121118
&self.engine,
122119
&self.connection,

‎src/dbus/pool/pool_3_5/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@ use crate::{
3535
shared::{pool_prop, set_pool_prop, try_pool_prop},
3636
},
3737
},
38-
engine::{
39-
self, ActionAvailability, DevUuid, Engine, FilesystemUuid, KeyDescription, Lockable,
40-
PoolUuid,
41-
},
38+
engine::{self, ActionAvailability, DevUuid, Engine, KeyDescription, Lockable, PoolUuid},
4239
stratis::StratisResult,
4340
};
4441

@@ -120,7 +117,7 @@ impl PoolR5 {
120117
async fn destroy_filesystems(
121118
&self,
122119
filesystems: Vec<ObjectPath<'_>>,
123-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
120+
) -> ((bool, Vec<String>), u16, String) {
124121
destroy_filesystems_method(
125122
&self.engine,
126123
&self.connection,

‎src/dbus/pool/pool_3_6/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ use crate::{
3737
},
3838
types::FilesystemSpec,
3939
},
40-
engine::{
41-
self, ActionAvailability, DevUuid, Engine, FilesystemUuid, KeyDescription, Lockable,
42-
PoolUuid,
43-
},
40+
engine::{self, ActionAvailability, DevUuid, Engine, KeyDescription, Lockable, PoolUuid},
4441
stratis::StratisResult,
4542
};
4643

@@ -122,7 +119,7 @@ impl PoolR6 {
122119
async fn destroy_filesystems(
123120
&self,
124121
filesystems: Vec<ObjectPath<'_>>,
125-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
122+
) -> ((bool, Vec<String>), u16, String) {
126123
destroy_filesystems_method(
127124
&self.engine,
128125
&self.connection,

‎src/dbus/pool/pool_3_7/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@ use crate::{
3838
},
3939
types::FilesystemSpec,
4040
},
41-
engine::{
42-
self, ActionAvailability, DevUuid, Engine, FilesystemUuid, KeyDescription, Lockable,
43-
PoolUuid,
44-
},
41+
engine::{self, ActionAvailability, DevUuid, Engine, KeyDescription, Lockable, PoolUuid},
4542
stratis::StratisResult,
4643
};
4744

@@ -123,7 +120,7 @@ impl PoolR7 {
123120
async fn destroy_filesystems(
124121
&self,
125122
filesystems: Vec<ObjectPath<'_>>,
126-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
123+
) -> ((bool, Vec<String>), u16, String) {
127124
destroy_filesystems_method(
128125
&self.engine,
129126
&self.connection,

‎src/dbus/pool/pool_3_8/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ use crate::{
3737
},
3838
types::FilesystemSpec,
3939
},
40-
engine::{
41-
self, ActionAvailability, DevUuid, Engine, FilesystemUuid, KeyDescription, Lockable,
42-
PoolUuid,
43-
},
40+
engine::{self, ActionAvailability, DevUuid, Engine, KeyDescription, Lockable, PoolUuid},
4441
stratis::StratisResult,
4542
};
4643

@@ -130,7 +127,7 @@ impl PoolR8 {
130127
async fn destroy_filesystems(
131128
&self,
132129
filesystems: Vec<ObjectPath<'_>>,
133-
) -> ((bool, Vec<FilesystemUuid>), u16, String) {
130+
) -> ((bool, Vec<String>), u16, String) {
134131
destroy_filesystems_method(
135132
&self.engine,
136133
&self.connection,

0 commit comments

Comments
 (0)