Fix replace by node target (#677)

dfinity · Jul 31, 2024 · 14ad1fd · 14ad1fd
1 parent 8f6e681
commit 14ad1fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/rs/cli/src/commands/subnet/replace.rs b/rs/cli/src/commands/subnet/replace.rs
@@ -66,7 +66,7 @@ impl ExecutableCommand for Replace {
             .with_target(subnet_target)
             .membership_replace(
                 !self.no_heal,
-                self.motivation.clone().unwrap_or_default(),
+                self.motivation.clone(),
                 self.optimize,
                 self.exclude.clone().into(),
                 self.only.clone(),

diff --git a/rs/cli/src/subnet_manager.rs b/rs/cli/src/subnet_manager.rs
@@ -110,16 +110,20 @@ impl SubnetManager {
     pub async fn membership_replace(
         &self,
         heal: bool,
-        motivation: String,
+        motivation: Option<String>,
         optimize: Option<usize>,
         exclude: Option<Vec<String>>,
         only: Vec<String>,
         include: Option<Vec<PrincipalId>>,
         min_nakamoto_coefficients: Option<MinNakamotoCoefficients>,
     ) -> anyhow::Result<SubnetChangeResponse> {
         let subnet_query_by = self.get_subnet_query_by(self.target()?).await?;
-        let mut motivations: Vec<String> = vec![motivation];
-        let mut to_be_replaced: Vec<DecentralizedNode> = vec![];
+        let mut motivations: Vec<String> = if let Some(motivation) = motivation { vec![motivation] } else { vec![] };
+        let mut to_be_replaced: Vec<DecentralizedNode> = if let SubnetQueryBy::NodeList(nodes) = &subnet_query_by {
+            nodes.clone()
+        } else {
+            vec![]
+        };
 
         let subnet_change_request = self
             .registry_instance