Re: [pdm-devel] [PATCH proxmox-datacenter-manager v6 4/6] fake remote: make the fake_remote feature compile again

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

On 8/20/25 10:26, Dominik Csapak wrote:
> 
> 
> On 8/14/25 09:56, Lukas Wagner wrote:
>> The ClientFactory trait was changed in Wolfgang's multi-client patches,
>> this commit adapts the fake remote feature to the changes.
>>
>> Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
>> Reviewed-by: Dominik Csapak <d.csapak@proxmox.com>
>> Tested-by: Dominik Csapak <d.csapak@proxmox.com>
>> ---
>>
>> Notes:
>>      Changes in v6:
>>        - add missing memhost value for ClusterResource
> 
> are you sure you wrote that to the correct patch? no 'memhost' or 'mem' 
> or 'host' occurs in this patch ;)
ignore this, was ofc part of the fixup^^

> 
>>      No changes in v5
>>      No changes in v4
>>      No changes in v3
>>      new in v2
>>
>>   server/src/test_support/fake_remote.rs | 29 +++++++++++++-------------
>>   1 file changed, 15 insertions(+), 14 deletions(-)
>>
>> diff --git a/server/src/test_support/fake_remote.rs b/server/src/ 
>> test_support/fake_remote.rs
>> index 0161d8e6..ae0f0af1 100644
>> --- a/server/src/test_support/fake_remote.rs
>> +++ b/server/src/test_support/fake_remote.rs
>> @@ -1,18 +1,22 @@
>> -use std::{collections::HashMap, time::Duration};
>> +use std::{collections::HashMap, sync::Arc, time::Duration};
>>   use anyhow::{bail, Error};
>> +use serde::Deserialize;
>> +
>>   use pdm_api_types::{remotes::Remote, Authid, ConfigDigest};
>>   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 +78,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 +92,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 +100,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 +119,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
> 
> 



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