From d58e6313e13b3a101916b3d0db972524907e6c47 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 27 Oct 2020 16:20:04 +0100 Subject: [PATCH] api/{verify, syncjobs}: add optional datastore parameter to limit the lists to the given datastores Signed-off-by: Dominik Csapak --- src/api2/admin/sync.rs | 19 +++++++++++++++++-- src/api2/admin/verify.rs | 19 +++++++++++++++++-- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index bea52a0a..e1072f72 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -15,7 +15,12 @@ use crate::tools::systemd::time::{ #[api( input: { - properties: {}, + properties: { + store: { + schema: DATASTORE_SCHEMA, + optional: true, + }, + }, }, returns: { description: "List configured jobs and their status.", @@ -25,13 +30,23 @@ use crate::tools::systemd::time::{ )] /// List all sync jobs pub fn list_sync_jobs( + store: Option, _param: Value, mut rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = sync::config()?; - let mut list: Vec = config.convert_to_typed_array("sync")?; + let mut list: Vec = config + .convert_to_typed_array("sync")? + .into_iter() + .filter(|job: &SyncJobStatus| { + if let Some(store) = &store { + &job.store == store + } else { + true + } + }).collect(); for job in &mut list { let last_state = JobState::load("syncjob", &job.id) diff --git a/src/api2/admin/verify.rs b/src/api2/admin/verify.rs index f61373a0..c5d84b43 100644 --- a/src/api2/admin/verify.rs +++ b/src/api2/admin/verify.rs @@ -15,7 +15,12 @@ use crate::server::UPID; #[api( input: { - properties: {}, + properties: { + store: { + schema: DATASTORE_SCHEMA, + optional: true, + }, + }, }, returns: { description: "List configured jobs and their status.", @@ -25,13 +30,23 @@ use crate::server::UPID; )] /// List all verification jobs pub fn list_verification_jobs( + store: Option, _param: Value, mut rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = verify::config()?; - let mut list: Vec = config.convert_to_typed_array("verification")?; + let mut list: Vec = config + .convert_to_typed_array("verification")? + .into_iter() + .filter(|job: &VerificationJobStatus| { + if let Some(store) = &store { + &job.store == store + } else { + true + } + }).collect(); for job in &mut list { let last_state = JobState::load("verificationjob", &job.id) -- 2.39.5