Skip to content

Commit ddbc17d

Browse files
committed
Implement EngineStateReport method on Manager
Signed-off-by: mulhern <amulhern@redhat.com>
1 parent f0bf462 commit ddbc17d

File tree

11 files changed

+80
-20
lines changed

11 files changed

+80
-20
lines changed

src/dbus/manager/manager_3_0/methods.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,3 +232,13 @@ pub async fn unlock_pool_method(
232232
}
233233
}
234234
}
235+
236+
pub fn engine_state_report_method(engine: &Arc<dyn Engine>) -> (String, u16, String) {
237+
match serde_json::to_string(&engine.engine_state_report()) {
238+
Ok(result) => (result, DbusErrorEnum::OK as u16, OK_STRING.to_string()),
239+
Err(e) => {
240+
let (rc, rs) = engine_to_dbus_err_tuple(&e.into());
241+
(String::new(), rc, rs)
242+
}
243+
}
244+
}

src/dbus/manager/manager_3_0/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ mod methods;
2323
mod props;
2424

2525
pub use methods::{
26-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method, unlock_pool_method,
27-
unset_key_method,
26+
create_pool_method, destroy_pool_method, engine_state_report_method, list_keys_method,
27+
set_key_method, unlock_pool_method, unset_key_method,
2828
};
2929
pub use props::{locked_pools_prop, version_prop};
3030

@@ -132,4 +132,9 @@ impl ManagerR0 {
132132
) -> ((bool, Vec<DevUuid>), u16, String) {
133133
unlock_pool_method(&self.engine, &self.connection, pool_uuid, unlock_method).await
134134
}
135+
136+
#[allow(non_snake_case)]
137+
fn EngineStateReport(&self) -> (String, u16, String) {
138+
engine_state_report_method(&self.engine)
139+
}
135140
}

src/dbus/manager/manager_3_1/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use crate::{
1818
dbus::{
1919
consts,
2020
manager::manager_3_0::{
21-
create_pool_method, destroy_pool_method, list_keys_method, locked_pools_prop,
22-
set_key_method, unlock_pool_method, unset_key_method, version_prop,
21+
create_pool_method, destroy_pool_method, engine_state_report_method, list_keys_method,
22+
locked_pools_prop, set_key_method, unlock_pool_method, unset_key_method, version_prop,
2323
},
2424
manager::Manager,
2525
},
@@ -130,4 +130,9 @@ impl ManagerR1 {
130130
) -> ((bool, Vec<DevUuid>), u16, String) {
131131
unlock_pool_method(&self.engine, &self.connection, pool_uuid, unlock_method).await
132132
}
133+
134+
#[allow(non_snake_case)]
135+
fn EngineStateReport(&self) -> (String, u16, String) {
136+
engine_state_report_method(&self.engine)
137+
}
133138
}

src/dbus/manager/manager_3_2/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ use crate::{
1818
dbus::{
1919
consts,
2020
manager::manager_3_0::{
21-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method,
22-
unset_key_method, version_prop,
21+
create_pool_method, destroy_pool_method, engine_state_report_method, list_keys_method,
22+
set_key_method, unset_key_method, version_prop,
2323
},
2424
manager::Manager,
2525
types,
@@ -160,4 +160,9 @@ impl ManagerR2 {
160160
async fn refresh_state(&self) -> (u16, String) {
161161
refresh_state_method(&self.engine).await
162162
}
163+
164+
#[allow(non_snake_case)]
165+
fn EngineStateReport(&self) -> (String, u16, String) {
166+
engine_state_report_method(&self.engine)
167+
}
163168
}

src/dbus/manager/manager_3_3/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::{
2020
manager::Manager,
2121
manager::{
2222
manager_3_0::{
23-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method,
24-
unset_key_method, version_prop,
23+
create_pool_method, destroy_pool_method, engine_state_report_method,
24+
list_keys_method, set_key_method, unset_key_method, version_prop,
2525
},
2626
manager_3_2::{
2727
refresh_state_method, start_pool_method, stop_pool_method, stopped_pools_prop,
@@ -159,4 +159,9 @@ impl ManagerR3 {
159159
async fn refresh_state(&self) -> (u16, String) {
160160
refresh_state_method(&self.engine).await
161161
}
162+
163+
#[allow(non_snake_case)]
164+
fn EngineStateReport(&self) -> (String, u16, String) {
165+
engine_state_report_method(&self.engine)
166+
}
162167
}

src/dbus/manager/manager_3_4/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::{
2020
manager::Manager,
2121
manager::{
2222
manager_3_0::{
23-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method,
24-
unset_key_method, version_prop,
23+
create_pool_method, destroy_pool_method, engine_state_report_method,
24+
list_keys_method, set_key_method, unset_key_method, version_prop,
2525
},
2626
manager_3_2::{refresh_state_method, stop_pool_method, stopped_pools_prop},
2727
},
@@ -163,4 +163,9 @@ impl ManagerR4 {
163163
async fn refresh_state(&self) -> (u16, String) {
164164
refresh_state_method(&self.engine).await
165165
}
166+
167+
#[allow(non_snake_case)]
168+
fn EngineStateReport(&self) -> (String, u16, String) {
169+
engine_state_report_method(&self.engine)
170+
}
166171
}

src/dbus/manager/manager_3_5/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::{
2020
manager::Manager,
2121
manager::{
2222
manager_3_0::{
23-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method,
24-
unset_key_method, version_prop,
23+
create_pool_method, destroy_pool_method, engine_state_report_method,
24+
list_keys_method, set_key_method, unset_key_method, version_prop,
2525
},
2626
manager_3_2::{refresh_state_method, stop_pool_method, stopped_pools_prop},
2727
manager_3_4::start_pool_method,
@@ -159,4 +159,9 @@ impl ManagerR5 {
159159
async fn refresh_state(&self) -> (u16, String) {
160160
refresh_state_method(&self.engine).await
161161
}
162+
163+
#[allow(non_snake_case)]
164+
fn EngineStateReport(&self) -> (String, u16, String) {
165+
engine_state_report_method(&self.engine)
166+
}
162167
}

src/dbus/manager/manager_3_6/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::{
2020
manager::Manager,
2121
manager::{
2222
manager_3_0::{
23-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method,
24-
unset_key_method, version_prop,
23+
create_pool_method, destroy_pool_method, engine_state_report_method,
24+
list_keys_method, set_key_method, unset_key_method, version_prop,
2525
},
2626
manager_3_2::{refresh_state_method, stopped_pools_prop},
2727
manager_3_4::start_pool_method,
@@ -163,4 +163,9 @@ impl ManagerR6 {
163163
async fn refresh_state(&self) -> (u16, String) {
164164
refresh_state_method(&self.engine).await
165165
}
166+
167+
#[allow(non_snake_case)]
168+
fn EngineStateReport(&self) -> (String, u16, String) {
169+
engine_state_report_method(&self.engine)
170+
}
166171
}

src/dbus/manager/manager_3_7/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::{
2020
manager::Manager,
2121
manager::{
2222
manager_3_0::{
23-
create_pool_method, destroy_pool_method, list_keys_method, set_key_method,
24-
unset_key_method, version_prop,
23+
create_pool_method, destroy_pool_method, engine_state_report_method,
24+
list_keys_method, set_key_method, unset_key_method, version_prop,
2525
},
2626
manager_3_2::{refresh_state_method, stopped_pools_prop},
2727
manager_3_4::start_pool_method,
@@ -160,4 +160,9 @@ impl ManagerR7 {
160160
async fn refresh_state(&self) -> (u16, String) {
161161
refresh_state_method(&self.engine).await
162162
}
163+
164+
#[allow(non_snake_case)]
165+
fn EngineStateReport(&self) -> (String, u16, String) {
166+
engine_state_report_method(&self.engine)
167+
}
163168
}

src/dbus/manager/manager_3_8/mod.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use crate::{
2020
manager::Manager,
2121
manager::{
2222
manager_3_0::{
23-
destroy_pool_method, list_keys_method, set_key_method, unset_key_method,
24-
version_prop,
23+
destroy_pool_method, engine_state_report_method, list_keys_method, set_key_method,
24+
unset_key_method, version_prop,
2525
},
2626
manager_3_2::refresh_state_method,
2727
manager_3_6::stop_pool_method,
@@ -173,4 +173,9 @@ impl ManagerR8 {
173173
async fn refresh_state(&self) -> (u16, String) {
174174
refresh_state_method(&self.engine).await
175175
}
176+
177+
#[allow(non_snake_case)]
178+
fn EngineStateReport(&self) -> (String, u16, String) {
179+
engine_state_report_method(&self.engine)
180+
}
176181
}

0 commit comments

Comments
 (0)