Re: [pdm-devel] [PATCH datacenter-manager] server: fake remotes: adapt to changed ClientFactory trait

[Dominik Csapak <d.csapak@proxmox.com>]

On 5/13/25 15:25, Lukas Wagner wrote:
> For the record, I already sent a patch for this in a previous patch series.
> 
> https://lore.proxmox.com/pdm-devel/20250418083210.74982-6-l.wagner@proxmox.com/T/#u
> 

yes, i noticed just before you sent this mail (see my other response, that weirdly
only contains a html part....)

but good to see that we basically have sent the same diff ^^

also, would it make sense to extend the fake remote part?

3 improvements i noticed that would be nice imho
* simulate more api calls
* fix some values (e.g. maxdisk is smaller than disk for hosts)
* add some pseudo random dynamic values? so that it changes over time a bit (e.g. via a configurable 
jitter percentage)
   this would be nice to fully test the ui without having to setup multiple test clusters

> On  2025-05-13 15:04, Dominik Csapak wrote:
>> that trait changed some types, so we have to adapt here, namely
>> * use the crate::connection::PveClient type instead of typing it manually
>> * use Arc instead of Box
>>
>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>> ---
>>   server/src/test_support/fake_remote.rs | 26 +++++++++++++-------------
>>   1 file changed, 13 insertions(+), 13 deletions(-)
>>
>> diff --git a/server/src/test_support/fake_remote.rs b/server/src/test_support/fake_remote.rs
>> index 0161d8e..c52bc32 100644
>> --- a/server/src/test_support/fake_remote.rs
>> +++ b/server/src/test_support/fake_remote.rs
>> @@ -1,4 +1,4 @@
>> -use std::{collections::HashMap, time::Duration};
>> +use std::{collections::HashMap, sync::Arc, time::Duration};
>>   
>>   use anyhow::{bail, Error};
>>   use pdm_api_types::{remotes::Remote, Authid, ConfigDigest};
>> @@ -6,13 +6,16 @@ use pdm_config::remotes::RemoteConfig;
>>   use proxmox_product_config::ApiLockGuard;
>>   use proxmox_section_config::typed::SectionConfigData;
>>   use pve_api_types::{
>> -    client::PveClient, ClusterMetrics, ClusterMetricsData, ClusterNodeIndexResponse,
>> -    ClusterNodeIndexResponseStatus, ClusterResource, ClusterResourceKind, ClusterResourceType,
>> -    ListTasks, ListTasksResponse, PveUpid, StorageContent,
>> +    ClusterMetrics, ClusterMetricsData, ClusterNodeIndexResponse, ClusterNodeIndexResponseStatus,
>> +    ClusterResource, ClusterResourceKind, ClusterResourceType, ListTasks, ListTasksResponse,
>> +    PveUpid, StorageContent,
>>   };
>>   use serde::Deserialize;
>>   
>> -use crate::{connection::ClientFactory, pbs_client::PbsClient};
>> +use crate::{
>> +    connection::{ClientFactory, PveClient},
>> +    pbs_client::PbsClient,
>> +};
>>   
>>   #[derive(Deserialize, Clone)]
>>   #[serde(rename_all = "kebab-case")]
>> @@ -74,8 +77,8 @@ impl FakeRemoteConfig {
>>   
>>   #[async_trait::async_trait]
>>   impl ClientFactory for FakeClientFactory {
>> -    fn make_pve_client(&self, _remote: &Remote) -> Result<Box<dyn PveClient + Send + Sync>, Error> {
>> -        Ok(Box::new(FakePveClient {
>> +    fn make_pve_client(&self, _remote: &Remote) -> Result<Arc<PveClient>, Error> {
>> +        Ok(Arc::new(FakePveClient {
>>               nr_of_vms: self.config.vms_per_pve_remote,
>>               nr_of_cts: self.config.cts_per_pve_remote,
>>               nr_of_nodes: self.config.nodes_per_pve_remote,
>> @@ -88,7 +91,7 @@ impl ClientFactory for FakeClientFactory {
>>           &self,
>>           _remote: &Remote,
>>           _target_endpoint: Option<&str>,
>> -    ) -> Result<Box<dyn PveClient + Send + Sync>, Error> {
>> +    ) -> Result<Arc<PveClient>, Error> {
>>           bail!("not implemented")
>>       }
>>   
>> @@ -96,10 +99,7 @@ impl ClientFactory for FakeClientFactory {
>>           bail!("not implemented")
>>       }
>>   
>> -    async fn make_pve_client_and_login(
>> -        &self,
>> -        _remote: &Remote,
>> -    ) -> Result<Box<dyn PveClient + Send + Sync>, Error> {
>> +    async fn make_pve_client_and_login(&self, _remote: &Remote) -> Result<Arc<PveClient>, Error> {
>>           bail!("not implemented")
>>       }
>>   
>> @@ -118,7 +118,7 @@ struct FakePveClient {
>>   }
>>   
>>   #[async_trait::async_trait]
>> -impl PveClient for FakePveClient {
>> +impl pve_api_types::client::PveClient for FakePveClient {
>>       async fn cluster_resources(
>>           &self,
>>           _ty: Option<ClusterResourceKind>,
> 



_______________________________________________
pdm-devel mailing list
pdm-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel