refactor: replica listing based on query

Signed-off-by: Abhinandan Purkait <[email protected]>

io-engine-tests/src/pool.rs

@@ -2,7 +2,7 @@ pub use super::compose::rpc::v1::pool::Pool;
 use super::{
     compose::rpc::v1::{
         pool::{CreatePoolRequest, ListPoolOptions},
-        replica::{ListReplicaOptions, Replica, ReplicaType},
+        replica::{ListReplicaOptions, Replica},
         SharedRpcHandle,
         Status,
     },
@@ -104,7 +104,7 @@ impl PoolBuilder {
                 poolname: None,
                 uuid: None,
                 pooluuid: self.uuid.clone(),
-                replicatype: ReplicaType::AllReplicas as i32,
+                query: None,
             })
             .await
             .map(|r| r.into_inner().replicas)

io-engine-tests/src/replica.rs

@@ -11,7 +11,6 @@ use mayastor_api::v1::replica::{
     DestroyReplicaRequest,
     ListReplicaOptions,
     Replica,
-    ReplicaType,
     ShareReplicaRequest,
 };
 
@@ -211,7 +210,7 @@ pub async fn list_replicas(
             poolname: None,
             uuid: None,
             pooluuid: None,
-            replicatype: ReplicaType::AllReplicas as i32,
+            query: None,
         })
         .await
         .map(|r| r.into_inner().replicas)
@@ -229,7 +228,7 @@ pub async fn find_replica_by_uuid(
             poolname: None,
             uuid: Some(uuid.to_owned()),
             pooluuid: None,
-            replicatype: ReplicaType::AllReplicas as i32,
+            query: None,
         })
         .await
         .map(|r| r.into_inner().replicas)?

io-engine/src/bin/io-engine-client/v1/replica_cli.rs

@@ -271,7 +271,7 @@ async fn replica_list(
             poolname: None,
             uuid: None,
             pooluuid: None,
-            replicatype: v1_rpc::replica::ReplicaType::AllReplicas as i32,
+            query: None,
         })
         .await
         .context(GrpcStatus)?;

io-engine/src/grpc/v1/replica.rs

@@ -125,41 +125,31 @@ impl ReplicaService {
     }
 }
 fn filter_replicas_by_replica_type(
-    replicas: Vec<Replica>,
-    replica_type: Option<ReplicaType>,
+    replica_list: Vec<Replica>,
+    query: Option<list_replica_options::Query>,
 ) -> Vec<Replica> {
-    let Some(replica_type) = replica_type else {
-        return replicas
+    let query = match query {
+        None => return replica_list,
+        Some(query) => query,
     };
-    replicas
+    replica_list
         .into_iter()
-        .filter_map(|r| match replica_type {
-            // AllReplicas
-            ReplicaType::AllReplicas => Some(r),
-            // AllReplicasExceptSnapshots
-            ReplicaType::AllReplicasExceptSnapshots => {
-                if !r.is_snapshot {
-                    Some(r)
-                } else {
-                    None
-                }
-            }
-            // OnlySnapshotClones
-            ReplicaType::OnlySnapshotClones => {
-                if r.is_clone {
-                    Some(r)
-                } else {
-                    None
-                }
-            }
-            // OnlyReplicas
-            ReplicaType::OnlyReplicas => {
-                if !r.is_snapshot && !r.is_clone {
-                    Some(r)
-                } else {
-                    None
+        .filter(|replica| {
+            let query = &query;
+
+            let query_fields = vec![
+                (query.snapshot, replica.is_snapshot),
+                (query.clone, replica.is_clone),
+                // ... add other fields here as needed
+            ];
+
+            query_fields.iter().all(|(query_field, replica_field)| {
+                match query_field {
+                    Some(true) => *replica_field,
+                    Some(false) => !(*replica_field),
+                    None => true,
                 }
-            }
+            })
         })
         .collect()
 }
@@ -353,10 +343,8 @@ impl ReplicaRpc for ReplicaService {
                 } else if let Some(uuid) = args.uuid {
                     replicas.retain(|r| r.uuid == uuid);
                 }
-                let replicas = filter_replicas_by_replica_type(
-                    replicas,
-                    ReplicaType::from_i32(args.replicatype),
-                );
+                let replicas =
+                    filter_replicas_by_replica_type(replicas, args.query);
                 Ok(ListReplicasResponse {
                     replicas,
                 })