oxidecomputer · davepacheco · Jun 13, 2025 · Mar 26, 2025 · Mar 26, 2025 · Mar 26, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dev-tools/omdb/tests/usage_errors.out b/dev-tools/omdb/tests/usage_errors.out
@@ -508,19 +508,22 @@ Options:
           Show sleds that match the given filter
 
           Possible values:
-          - all:                      All sleds in the system, regardless of policy or state
-          - commissioned:             All sleds that are currently part of the control plane cluster
-          - decommissioned:           All sleds that were previously part of the control plane
+          - all:                           All sleds in the system, regardless of policy or state
+          - commissioned:                  All sleds that are currently part of the control plane
+            cluster
+          - decommissioned:                All sleds that were previously part of the control plane
             cluster but have been decommissioned
-          - discretionary:            Sleds that are eligible for discretionary services
-          - in-service:               Sleds that are in service (even if they might not be eligible
-            for discretionary services)
-          - query-during-inventory:   Sleds whose sled agents should be queried for inventory
-          - reservation-create:       Sleds on which reservations can be created
-          - vpc-routing:              Sleds which should be sent OPTE V2P mappings and Routing rules
-          - vpc-firewall:             Sleds which should be sent VPC firewall rules
-          - tuf-artifact-replication: Sleds which should have TUF repo artifacts replicated onto
-            them
+          - discretionary:                 Sleds that are eligible for discretionary services
+          - in-service:                    Sleds that are in service (even if they might not be
+            eligible for discretionary services)
+          - query-during-inventory:        Sleds whose sled agents should be queried for inventory
+          - reservation-create:            Sleds on which reservations can be created
+          - vpc-routing:                   Sleds which should be sent OPTE V2P mappings and Routing
+            rules
+          - vpc-firewall:                  Sleds which should be sent VPC firewall rules
+          - tuf-artifact-replication:      Sleds which should have TUF repo artifacts replicated
+            onto them
+          - sps-updated-by-reconfigurator: Sleds whose SPs should be updated by Reconfigurator
 
       --log-level <LOG_LEVEL>
           log level filter

diff --git a/dev-tools/reconfigurator-cli/src/lib.rs b/dev-tools/reconfigurator-cli/src/lib.rs
@@ -208,6 +208,7 @@ fn process_command(
         Commands::SledRemove(args) => cmd_sled_remove(sim, args),
         Commands::SledShow(args) => cmd_sled_show(sim, args),
         Commands::SledSetPolicy(args) => cmd_sled_set_policy(sim, args),
+        Commands::SledUpdateSp(args) => cmd_sled_update_sp(sim, args),
         Commands::SiloList => cmd_silo_list(sim),
         Commands::SiloAdd(args) => cmd_silo_add(sim, args),
         Commands::SiloRemove(args) => cmd_silo_remove(sim, args),
@@ -261,6 +262,8 @@ enum Commands {
     SledShow(SledArgs),
     /// set a sled's policy
     SledSetPolicy(SledSetPolicyArgs),
+    /// simulate updating the sled's SP versions
+    SledUpdateSp(SledUpdateSpArgs),
 
     /// list silos
     SiloList,
@@ -372,6 +375,20 @@ impl From<SledPolicyOpt> for SledPolicy {
     }
 }
 
+#[derive(Debug, Args)]
+struct SledUpdateSpArgs {
+    /// id of the sled
+    sled_id: SledUuid,
+
+    /// sets the version reported for the SP active slot
+    #[clap(long, required_unless_present_any = &["inactive"])]
+    active: Option<ArtifactVersion>,
+
+    /// sets the version reported for the SP inactive slot
+    #[clap(long, required_unless_present_any = &["active"])]
+    inactive: Option<ExpectedVersion>,
+}
+
 #[derive(Debug, Args)]
 struct SledRemoveArgs {
     /// id of the sled
@@ -885,18 +902,22 @@ fn cmd_sled_show(
     args: SledArgs,
 ) -> anyhow::Result<Option<String>> {
     let state = sim.current_state();
-    let planning_input = state
-        .system()
-        .description()
+    let description = state.system().description();
+    let sled_id = args.sled_id;
+    let sp_active_version = description.sled_sp_active_version(sled_id)?;
+    let sp_inactive_version = description.sled_sp_inactive_version(sled_id)?;
+    let planning_input = description
         .to_planning_input_builder()
         .context("failed to generate planning_input builder")?
         .build();
-    let sled_id = args.sled_id;
-    let sled_resources =
-        &planning_input.sled_lookup(args.filter, sled_id)?.resources;
+    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, "serial {}", sled.baseboard_id.serial_number);
     swriteln!(s, "subnet {}", sled_resources.subnet.net());
+    swriteln!(s, "SP active version:   {:?}", sp_active_version);
+    swriteln!(s, "SP inactive version: {:?}", sp_inactive_version);
     swriteln!(s, "zpools ({}):", sled_resources.zpools.len());
     for (zpool, disk) in &sled_resources.zpools {
         swriteln!(s, "    {:?}", zpool);
@@ -924,6 +945,46 @@ fn cmd_sled_set_policy(
     Ok(Some(format!("set sled {} policy to {}", args.sled_id, args.policy)))
 }
 
+fn cmd_sled_update_sp(
+    sim: &mut ReconfiguratorSim,
+    args: SledUpdateSpArgs,
+) -> anyhow::Result<Option<String>> {
+    let mut labels = Vec::new();
+    if let Some(active) = &args.active {
+        labels.push(format!("active -> {}", active));
+    }
+    if let Some(inactive) = &args.inactive {
+        labels.push(format!("inactive -> {}", inactive));
+    }
+
+    assert!(
+        !labels.is_empty(),
+        "clap configuration requires that at least one argument is specified"
+    );
+
+    let mut state = sim.current_state().to_mut();
+    state.system_mut().description_mut().sled_update_sp_versions(
+        args.sled_id,
+        args.active,
+        args.inactive,
+    )?;
+
+    sim.commit_and_bump(
+        format!(
+            "reconfigurator-cli sled-update-sp: {}: {}",
+            args.sled_id,
+            labels.join(", "),
+        ),
+        state,
+    );
+
+    Ok(Some(format!(
+        "set sled {} SP versions: {}",
+        args.sled_id,
+        labels.join(", ")
+    )))
+}
+
 fn cmd_inventory_list(
     sim: &mut ReconfiguratorSim,
 ) -> anyhow::Result<Option<String>> {

diff --git a/dev-tools/reconfigurator-cli/tests/input/cmds.txt b/dev-tools/reconfigurator-cli/tests/input/cmds.txt
@@ -13,6 +13,18 @@ sled-add 90c1102a-b9f5-4d88-92a2-60d54a2d98cc
 sled-add 04ef3330-c682-4a08-8def-fcc4bef31bcd
 sled-list
 
+sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a
+sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a --active 1.0.0
+sled-show dde1c0e2-b10d-4621-b420-f179f7a7a00a
+sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a --inactive 2.0.0
+sled-show dde1c0e2-b10d-4621-b420-f179f7a7a00a
+sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a --active 3.0.0
+sled-show dde1c0e2-b10d-4621-b420-f179f7a7a00a
+sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a --active 4.0.0 --inactive invalid
+sled-show dde1c0e2-b10d-4621-b420-f179f7a7a00a
+sled-update-sp dde1c0e2-b10d-4621-b420-f179f7a7a00a --active 4.0.0 --inactive 5.0.0
+sled-show dde1c0e2-b10d-4621-b420-f179f7a7a00a
+
 inventory-generate
 inventory-list
 

diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout
@@ -37,7 +37,10 @@ T ENA ID                                   PARENT
 
 > sled-show 2eb69596-f081-4e2d-9425-9994926e0832
 sled 2eb69596-f081-4e2d-9425-9994926e0832
+serial serial1
 subnet fd00:1122:3344:102::/64
+SP active version:   Some("0.0.1")
+SP inactive version: None
 zpools (10):
     088ed702-551e-453b-80d7-57700372a844 (zpool)
     SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-088ed702-551e-453b-80d7-57700372a844" }, disk_id: b2850ccb-4ac7-4034-aeab-b1cd582d407b (physical_disk), policy: InService, state: Active }
@@ -395,7 +398,10 @@ T ENA ID                                   PARENT
 
 > sled-show 89d02b1b-478c-401a-8e28-7a26f74fa41b
 sled 89d02b1b-478c-401a-8e28-7a26f74fa41b
+serial serial0
 subnet fd00:1122:3344:101::/64
+SP active version:   Some("0.0.1")
+SP inactive version: None
 zpools (4):
     44fa7024-c2bc-4d2c-b478-c4997e4aece8 (zpool)
     SledDisk { disk_identity: DiskIdentity { vendor: "fake-vendor", model: "fake-model", serial: "serial-44fa7024-c2bc-4d2c-b478-c4997e4aece8" }, disk_id: 2a15b33c-dd0e-45b7-aba9-d05f40f030ff (physical_disk), policy: InService, state: Active }
@@ -497,6 +503,7 @@ WARN failed to place all new desired InternalDns zones, placed: 0, wanted_to_pla
 INFO sufficient ExternalDns zones exist in plan, desired_count: 0, current_count: 0
 WARN failed to place all new desired Nexus zones, placed: 0, wanted_to_place: 3
 INFO sufficient Oximeter zones exist in plan, desired_count: 0, current_count: 0
+WARN cannot issue more SP updates (no current artifacts)
 INFO some zones not yet up-to-date, sled_id: 89d02b1b-478c-401a-8e28-7a26f74fa41b
 INFO will ensure cockroachdb setting, setting: cluster.preserve_downgrade_option, value: DoNotModify
 generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a

diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout
@@ -974,6 +974,7 @@ INFO sufficient InternalDns zones exist in plan, desired_count: 3, current_count
 INFO added zone to sled, sled_id: a88790de-5962-4871-8686-61c1fd5b7094, kind: ExternalDns
 INFO sufficient Nexus zones exist in plan, desired_count: 3, current_count: 3
 INFO sufficient Oximeter zones exist in plan, desired_count: 0, current_count: 0
+WARN cannot issue more SP updates (no current artifacts)
 INFO some zones not yet up-to-date, sled_id: a88790de-5962-4871-8686-61c1fd5b7094
 INFO will ensure cockroachdb setting, setting: cluster.preserve_downgrade_option, value: DoNotModify
 generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0

diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout b/dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout
@@ -1004,6 +1004,7 @@ INFO added zone to sled, sled_id: d81c6a84-79b8-4958-ae41-ea46c9b19763, kind: In
 INFO sufficient ExternalDns zones exist in plan, desired_count: 3, current_count: 3
 INFO sufficient Nexus zones exist in plan, desired_count: 3, current_count: 3
 INFO sufficient Oximeter zones exist in plan, desired_count: 0, current_count: 0
+WARN cannot issue more SP updates (no current artifacts)
 INFO some zones not yet up-to-date, sled_id: d81c6a84-79b8-4958-ae41-ea46c9b19763
 INFO will ensure cockroachdb setting, setting: cluster.preserve_downgrade_option, value: DoNotModify
 generated blueprint af934083-59b5-4bf6-8966-6fb5292c29e1 based on parent blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4

diff --git a/dev-tools/reconfigurator-cli/tests/output/cmds-stderr b/dev-tools/reconfigurator-cli/tests/output/cmds-stderr
@@ -0,0 +1,7 @@
+error: the following required arguments were not provided:
+  --active <ACTIVE>
+  --inactive <INACTIVE>
+
+Usage: sled-update-sp --active <ACTIVE> --inactive <INACTIVE> <SLED_ID>
+
+For more information, try '--help'.