Skip to content

Commit 42362a7

Browse files
committed
set_name: return String types for pool UUIDs
Signed-off-by: mulhern <amulhern@redhat.com>
1 parent a3d4020 commit 42362a7

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

src/dbus/pool/pool_3_0/methods.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -540,8 +540,8 @@ pub async fn set_name_method(
540540
manager: &Lockable<Arc<RwLock<Manager>>>,
541541
pool_uuid: PoolUuid,
542542
name: &str,
543-
) -> ((bool, PoolUuid), u16, String) {
544-
let default_return = (false, PoolUuid::default());
543+
) -> ((bool, String), u16, String) {
544+
let default_return = (false, PoolUuid::default().simple().to_string());
545545

546546
match engine.rename_pool(pool_uuid, name).await {
547547
Ok(RenameAction::NoSource) => {
@@ -566,7 +566,7 @@ pub async fn set_name_method(
566566
}
567567
};
568568
(
569-
(true, pool_uuid),
569+
(true, pool_uuid.simple().to_string()),
570570
DbusErrorEnum::OK as u16,
571571
OK_STRING.to_string(),
572572
)

src/dbus/pool/pool_3_0/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl PoolR0 {
185185
.await
186186
}
187187

188-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
188+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
189189
set_name_method(
190190
&self.engine,
191191
&self.connection,

src/dbus/pool/pool_3_1/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl PoolR1 {
188188
.await
189189
}
190190

191-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
191+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
192192
set_name_method(
193193
&self.engine,
194194
&self.connection,

src/dbus/pool/pool_3_2/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ impl PoolR2 {
185185
.await
186186
}
187187

188-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
188+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
189189
set_name_method(
190190
&self.engine,
191191
&self.connection,

src/dbus/pool/pool_3_3/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ impl PoolR3 {
189189
.await
190190
}
191191

192-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
192+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
193193
set_name_method(
194194
&self.engine,
195195
&self.connection,

src/dbus/pool/pool_3_4/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ impl PoolR4 {
186186
.await
187187
}
188188

189-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
189+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
190190
set_name_method(
191191
&self.engine,
192192
&self.connection,

src/dbus/pool/pool_3_5/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ impl PoolR5 {
190190
.await
191191
}
192192

193-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
193+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
194194
set_name_method(
195195
&self.engine,
196196
&self.connection,

src/dbus/pool/pool_3_6/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl PoolR6 {
192192
.await
193193
}
194194

195-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
195+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
196196
set_name_method(
197197
&self.engine,
198198
&self.connection,

src/dbus/pool/pool_3_7/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl PoolR7 {
193193
.await
194194
}
195195

196-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
196+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
197197
set_name_method(
198198
&self.engine,
199199
&self.connection,

src/dbus/pool/pool_3_8/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ impl PoolR8 {
200200
.await
201201
}
202202

203-
async fn set_name(&self, name: &str) -> ((bool, PoolUuid), u16, String) {
203+
async fn set_name(&self, name: &str) -> ((bool, String), u16, String) {
204204
set_name_method(
205205
&self.engine,
206206
&self.connection,

0 commit comments

Comments
 (0)