feat: refactor trait functions related to delete configurations and related data

Author: Masber

Cargo.toml

@@ -13,7 +13,8 @@ publish = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-manta-backend-dispatcher = "0.16.1"
+manta-backend-dispatcher = "0.18.0"
+
 # manta-backend-dispatcher = { path = "../manta-backend-dispatcher" } # Only for development purposes
 # manta-backend-dispatcher = { git = "https://github.com/eth-cscs/manta-backend-dispatcher", branch="feature/power-status" } # Only for development purposes
 

src/backend_connector.rs

@@ -15,8 +15,8 @@ use manta_backend_dispatcher::{
     bos::{ClusterSessionTrait, ClusterTemplateTrait},
     bss::BootParametersTrait,
     cfs::CfsTrait,
-    commands::CommandsTrait,
     console::ConsoleTrait,
+    delete_configurations_and_data_related::DeleteConfigurationsAndDataRelatedTrait,
     get_images_and_details::GetImagesAndDetailsTrait,
     hsm::{
       component::ComponentTrait,
@@ -2199,8 +2199,8 @@ impl ClusterTemplateTrait for Csm {
   }
 }
 
-impl CommandsTrait for Csm {
-  async fn i_delete_data_related_to_cfs_configuration(
+impl DeleteConfigurationsAndDataRelatedTrait for Csm {
+  /* async fn delete_data_related_to_cfs_configuration(
     &self,
     shasta_token: &str,
     shasta_base_url: &str,
@@ -2223,6 +2223,81 @@ impl CommandsTrait for Csm {
     )
     .await
     .map_err(|e| Error::Message(e.to_string()))
+  } */
+
+  async fn get_data_to_delete(
+    &self,
+    shasta_token: &str,
+    shasta_base_url: &str,
+    shasta_root_cert: &[u8],
+    hsm_name_available_vec: &[&str],
+    configuration_name_pattern_opt: Option<&str>,
+    since_opt: Option<NaiveDateTime>,
+    until_opt: Option<NaiveDateTime>,
+  ) -> Result<
+    (
+      Vec<CfsSessionGetResponse>,
+      Vec<(String, String, String)>,
+      Vec<String>,
+      Vec<String>,
+      Vec<(String, String, String)>,
+      Vec<CfsConfigurationResponse>,
+    ),
+    Error,
+  > {
+    crate::commands::delete_configurations_and_data_related::get_data_to_delete(
+      shasta_token,
+      shasta_base_url,
+      shasta_root_cert,
+      hsm_name_available_vec,
+      configuration_name_pattern_opt,
+      since_opt,
+      until_opt,
+    )
+    .await
+    .map(
+      |(
+        cfs_sessions,
+        images,
+        bos_templates,
+        hsm_groups,
+        boot_params,
+        configurations,
+      )| {
+        (
+          cfs_sessions.into_iter().map(|s| s.into()).collect(),
+          images,
+          bos_templates,
+          hsm_groups,
+          boot_params,
+          configurations.into_iter().map(|c| c.into()).collect(),
+        )
+      },
+    )
+    .map_err(|e| Error::Message(e.to_string()))
+  }
+
+  async fn delete(
+    &self,
+    shasta_token: &str,
+    shasta_base_url: &str,
+    shasta_root_cert: &[u8],
+    cfs_configuration_name_vec: &[String],
+    image_id_vec: &[String],
+    cfs_session_name_vec: &[String],
+    bos_sessiontemplate_name_vec: &[String],
+  ) -> Result<(), Error> {
+    crate::commands::delete_configurations_and_data_related::delete(
+      shasta_token,
+      shasta_base_url,
+      shasta_root_cert,
+      cfs_configuration_name_vec,
+      image_id_vec,
+      cfs_session_name_vec,
+      bos_sessiontemplate_name_vec,
+    )
+    .await
+    .map_err(|e| Error::Message(e.to_string()))
   }
 }