[23/n] [reconfigurator-cli] allow setting sled policy in more situations (#8491)

Enable setting sled policy while loading up an initial example, and
while adding a new sled. Also make it so that discretionary zones don't
end up on non-provisionable sleds during the initial example.

Author: sunshowers

dev-tools/reconfigurator-cli/src/lib.rs

@@ -337,6 +337,10 @@ struct SledAddArgs {
     /// number of disks or pools
     #[clap(short = 'd', long, visible_alias = "npools", default_value_t = SledBuilder::DEFAULT_NPOOLS)]
     ndisks: u8,
+
+    /// The policy for the sled.
+    #[clap(long, value_enum, default_value_t = SledPolicyOpt::InService)]
+    policy: SledPolicyOpt,
 }
 
 #[derive(Debug, Args)]
@@ -847,6 +851,44 @@ struct LoadExampleArgs {
     /// Do not create entries for disks in the blueprint.
     #[clap(long)]
     no_disks_in_blueprint: bool,
+
+    /// Set a 0-indexed sled's policy
+    #[clap(long, value_name = "INDEX:POLICY")]
+    sled_policy: Vec<LoadExampleSledPolicy>,
+}
+
+#[derive(Clone, Debug)]
+struct LoadExampleSledPolicy {
+    /// The index of the sled to set the policy for.
+    index: usize,
+
+    /// The policy to set.
+    policy: SledPolicy,
+}
+
+impl FromStr for LoadExampleSledPolicy {
+    type Err = anyhow::Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let (index, policy) = s
+            .split_once(':')
+            .context("invalid format, expected <index>:<policy>")?;
+        let index = index.parse().with_context(|| {
+            format!("error parsing sled index `{index}` as a usize")
+        })?;
+        let policy = SledPolicyOpt::from_str(
+            policy, /* ignore_case */ false,
+        )
+        .map_err(|_message| {
+            // _message is just something like "invalid variant: <value>".
+            // We choose to use our own message instead.
+            anyhow!(
+                "invalid sled policy `{policy}` (possible values: {})",
+                SledPolicyOpt::value_variants().iter().join(", "),
+            )
+        })?;
+        Ok(LoadExampleSledPolicy { index, policy: policy.into() })
+    }
 }
 
 #[derive(Debug, Args)]
@@ -954,7 +996,10 @@ fn cmd_sled_add(
 ) -> anyhow::Result<Option<String>> {
     let mut state = sim.current_state().to_mut();
     let sled_id = add.sled_id.unwrap_or_else(|| state.rng_mut().next_sled_id());
-    let new_sled = SledBuilder::new().id(sled_id).npools(add.ndisks);
+    let new_sled = SledBuilder::new()
+        .id(sled_id)
+        .npools(add.ndisks)
+        .policy(add.policy.into());
     let system = state.system_mut();
     system.description_mut().sled(new_sled)?;
     // Figure out what serial number this sled was assigned.
@@ -1008,7 +1053,7 @@ fn cmd_sled_show(
     let sled = planning_input.sled_lookup(args.filter, sled_id)?;
     let sled_resources = &sled.resources;
     let mut s = String::new();
-    swriteln!(s, "sled {}", sled_id);
+    swriteln!(s, "sled {} ({}, {})", sled_id, sled.policy, sled.state);
     swriteln!(s, "serial {}", sled.baseboard_id.serial_number);
     swriteln!(s, "subnet {}", sled_resources.subnet.net());
     swriteln!(s, "SP active version:   {:?}", sp_active_version);
@@ -2006,21 +2051,26 @@ fn cmd_load_example(
     };
     let rng = state.rng_mut().next_example_rng();
 
-    let (example, blueprint) =
-        ExampleSystemBuilder::new_with_rng(&sim.log, rng)
-            .nsleds(args.nsleds)
-            .ndisks_per_sled(args.ndisks_per_sled)
-            .nexus_count(
-                state
-                    .config_mut()
-                    .num_nexus()
-                    .map_or(NEXUS_REDUNDANCY, |n| n.into()),
-            )
-            .external_dns_count(3)
-            .context("invalid external DNS zone count")?
-            .create_zones(!args.no_zones)
-            .create_disks_in_blueprint(!args.no_disks_in_blueprint)
-            .build();
+    let mut builder = ExampleSystemBuilder::new_with_rng(&sim.log, rng)
+        .nsleds(args.nsleds)
+        .ndisks_per_sled(args.ndisks_per_sled)
+        .nexus_count(
+            state
+                .config_mut()
+                .num_nexus()
+                .map_or(NEXUS_REDUNDANCY, |n| n.into()),
+        )
+        .external_dns_count(3)
+        .context("invalid external DNS zone count")?
+        .create_zones(!args.no_zones)
+        .create_disks_in_blueprint(!args.no_disks_in_blueprint);
+    for sled_policy in args.sled_policy {
+        builder = builder
+            .with_sled_policy(sled_policy.index, sled_policy.policy)
+            .context("setting sled policy")?;
+    }
+
+    let (example, blueprint) = builder.build();
 
     // Generate the internal and external DNS configs based on the blueprint.
     let sleds_by_id = make_sleds_by_id(&example.system)?;

dev-tools/reconfigurator-cli/tests/input/cmds-example.txt

@@ -45,3 +45,19 @@ blueprint-diff 86db3308-f817-4626-8838-4085949a6a41
 blueprint-diff 02697f74-b14a-4418-90f0-c28b2a3a6aa9 86db3308-f817-4626-8838-4085949a6a41
 # You can specify them in the reverse order and see the opposite changes.
 blueprint-diff 86db3308-f817-4626-8838-4085949a6a41 02697f74-b14a-4418-90f0-c28b2a3a6aa9
+
+# Load an example with a non-provisionable and an expunged sled.
+wipe all
+load-example --seed test-basic --nsleds 3 --sled-policy 1:non-provisionable --sled-policy 2:expunged --ndisks-per-sled 3
+
+blueprint-list
+blueprint-show latest
+
+# Plan a blueprint run -- this will cause zones and disks on the expunged
+# sled to be expunged.
+blueprint-plan latest
+blueprint-diff ade5749d-bdf3-4fab-a8ae-00bea01b3a5a latest
+
+# Sled index out of bounds, will error out.
+wipe all
+load-example --seed test-basic --nsleds 3 --sled-policy 3:non-provisionable

dev-tools/reconfigurator-cli/tests/input/cmds.txt

@@ -10,7 +10,7 @@ sled-add dde1c0e2-b10d-4621-b420-f179f7a7a00a
 sled-list
 sled-show dde1c0e2-b10d-4621-b420-f179f7a7a00a
 sled-add 90c1102a-b9f5-4d88-92a2-60d54a2d98cc
-sled-add 04ef3330-c682-4a08-8def-fcc4bef31bcd
+sled-add 04ef3330-c682-4a08-8def-fcc4bef31bcd --policy non-provisionable
 sled-list
 
 sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a