Skip to content

add ReflectsCollection to blueprint #11705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davepacheco wants to merge 3 commits into
base: main
Choose a base branch
from
Open

add ReflectsCollection to blueprint #11705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f59522
add ReflectsCollection to blueprint
davepacheco Nov 4, 2026
bf37a55
claude own review
davepacheco Nov 4, 2026
a0d19f8
dap review
davepacheco Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dev-tools/omdb/tests/successes.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2215,6 +2215,7 @@ parent: <none>
created by:::::::::::::: nexus-test-utils
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: initial test blueprint
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 2
target release min gen:: 1
Expand Down Expand Up @@ -2364,6 +2365,7 @@ parent: <none>
created by:::::::::::::: nexus-test-utils
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: initial test blueprint
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 2
target release min gen:: 1
Expand Down
22 changes: 19 additions & 3 deletions dev-tools/reconfigurator-cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ use nexus_types::deployment::BlueprintSledUpdateDispositionKind;
use nexus_types::deployment::CockroachDbSettings;
use nexus_types::deployment::PlannerConfig;
use nexus_types::deployment::ReconfiguratorDisruptionPolicy;
use nexus_types::deployment::ReflectsCollection;
use nexus_types::deployment::SledUpdateRebootPolicy;
use nexus_types::deployment::execution::blueprint_external_dns_config;
use nexus_types::deployment::execution::blueprint_internal_dns_config;
Expand Down Expand Up @@ -2702,9 +2703,24 @@ fn cmd_blueprint_edit(
.map(|c| c.clone())
.unwrap_or_else(|| CollectionBuilder::new("sim").build());

let mut builder =
BlueprintBuilder::new_based_on(&sim.log, blueprint, creator, rng)
.context("creating blueprint builder")?;
// Specify an indeterminate value for `reflects_collection`. This field
// normally indicates what inventory collection the planner used when
// constructing the blueprint, which implies that the blueprint reflects the
// state of the world described in that collection. But we're changing the
// blueprint in some arbitrary way and it's no longer accurate to say that
// the new blueprint does reflect any particular state of the world.
// (That's not to say we couldn't allow the caller to specify a different
// value here. After all, they're editing the blueprint to say whatever
// they want. But it's not obviously useful to do this yet, either.)
let reflects_collection = ReflectsCollection::Indeterminate;
let mut builder = BlueprintBuilder::new_based_on(
&sim.log,
blueprint,
reflects_collection,
creator,
rng,
)
.context("creating blueprint builder")?;

// We're acting as the planner here, so we need to update the builder for
// any static changes in the input (e.g., new sleds, new DNS versions, ...).
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use nexus_types::deployment::Blueprint;
use nexus_types::deployment::BlueprintSource;
use nexus_types::deployment::ClickhousePolicy;
use nexus_types::deployment::PlanningInput;
use nexus_types::deployment::ReflectsCollection;
use nexus_types::external_api::sled::SledPolicy;
use nexus_types::inventory::Collection;
use omicron_uuid_kinds::SledUuid;
Expand Down Expand Up @@ -270,6 +271,7 @@ impl ReconfiguratorCliTestState {
let mut builder = BlueprintBuilder::new_based_on(
&log,
blueprint,
ReflectsCollection::Indeterminate,
"ReconfiguratorCliTestState",
rng,
)?;
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-add-sled-no-disks-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,9 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: eb0796d5-ab8a-4f7b-a884-b4aeacb8ab51
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-blueprint-noop-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -524,6 +525,7 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -688,6 +689,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1509,6 +1511,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
5 changes: 5 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1047,6 +1048,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1689,6 +1691,9 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: 8bc58dd6-dd6e-44e2-9671-e35a2a941c98
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
1 change: 1 addition & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
1 change: 1 addition & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-zones-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-host-phase-2-source-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ parent: 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1118,6 +1119,7 @@ parent: af934083-59b5-4bf6-8966-6fb5292c29e1
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
12 changes: 12 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,6 +1504,9 @@ parent: c1a0d242-9160-40f4-96ae-61f8f40a0b1b
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: a71f7a73-35a6-45e8-acbe-f1c5925eed69
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 4
Expand Down Expand Up @@ -1877,6 +1880,9 @@ parent: afb09faf-a586-4483-9289-04d4f1d8ba23
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: sled d81c6a84-79b8-4958-ae41-ea46c9b19763: performed all noop measurements updates, sled d81c6a84-79b8-4958-ae41-ea46c9b19763: performed 6 noop zone image source updates
reflects collection::::: 0b5efbb3-0b1b-4bbf-b7d8-a2d6fca074c6
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 4
Expand Down Expand Up @@ -2307,6 +2313,9 @@ parent: 8f2d1f39-7c88-4701-aa43-56bf281b28c1
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: performed 7 noop zone image source updates
reflects collection::::: 39363465-89ae-4ac2-9be1-099068da9d45
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 4
Expand Down Expand Up @@ -2795,6 +2804,9 @@ parent: 12d602a6-5ab4-487a-b94e-eb30cdf30300
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: update Sled 0 (serial0) RoT bootloader to 2.0.0
reflects collection::::: 04bc9001-0836-4fec-b9cb-9d4760caf8b4
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 4
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,6 +1437,9 @@ parent: 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: 61f451b3-2121-4ed6-91c7-a550054f6c21
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
5 changes: 5 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-set-mgs-updates-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ parent: 6ccc786b-17f1-4562-958f-5a7d9a5a15fd
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -523,6 +524,7 @@ parent: ad97e762-7bf1-45a6-a98f-60afb7e491c0
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -872,6 +874,7 @@ parent: cca24b71-09b5-4042-9185-b33e9f2ebba0
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1224,6 +1227,7 @@ parent: 5bf974f3-81f9-455b-b24e-3099f765664c
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1535,6 +1539,7 @@ parent: 1b837a27-3be1-4fcb-8499-a921c839e1d0
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-set-remove-mupdate-override-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,7 @@ parent: df06bb57-ad42-4431-9206-abff322896c7
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -1236,6 +1237,7 @@ parent: afb09faf-a586-4483-9289-04d4f1d8ba23
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: updated target release minimum generation from 1 to 2
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 2
Expand Down
1 change: 1 addition & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-set-update-disposition-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ parent: af934083-59b5-4bf6-8966-6fb5292c29e1
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-set-zone-images-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ parent: 1b013011-2062-4b48-b544-a32b23bce83a
created by:::::::::::::: test suite
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -260,6 +261,7 @@ parent: 9766ca20-38d4-4380-b005-e7c43c797e7c
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down Expand Up @@ -525,6 +527,7 @@ parent: bb128f06-a2e1-44c1-8874-4f789d0ff896
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-target-release-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11371,6 +11371,9 @@ parent: 82039d86-8b67-4a8b-85b3-61889053daca
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: 85b886b3-77f1-448f-b80b-b519a7209328
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-unknown-measurements-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,9 @@ parent: 58d5e830-0884-47d8-a7cd-b2b3751adeb4
created by:::::::::::::: reconfigurator-sim
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: update Sled 0 (serial0) RoT bootloader to 1.0.0
reflects collection::::: b1bda47d-2c19-4fba-96e3-d9df28db7436
collection started:::::: <REDACTED_TIMESTAMP>
collection done::::::::: <REDACTED_TIMESTAMP>
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
1 change: 1 addition & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-unsafe-zone-mgs-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1482,6 +1482,7 @@ parent: 58d5e830-0884-47d8-a7cd-b2b3751adeb4
created by:::::::::::::: reconfigurator-cli
created at:::::::::::::: <REDACTED_TIMESTAMP>
comment::::::::::::::::: (none)
reflects collection::::: (indeterminate)
internal DNS version:::: 1
external DNS version:::: 1
target release min gen:: 1
Expand Down
2 changes: 2 additions & 0 deletions live-tests/tests/common/reconfigurator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ use nexus_lockstep_client::types::{
};
use nexus_reconfigurator_planning::blueprint_builder::BlueprintBuilder;
use nexus_reconfigurator_planning::planner::PlannerRng;
use nexus_types::deployment::ReflectsCollection;
use nexus_types::deployment::{Blueprint, BlueprintSource};
use nexus_types::external_api::sled::SledState;
use nexus_types::inventory::Collection;
Expand Down Expand Up @@ -110,6 +111,7 @@ fn blueprint_builder_based_on<'a>(
BlueprintBuilder::new_based_on(
log,
parent,
ReflectsCollection::Indeterminate,
"test-suite",
PlannerRng::from_entropy(),
)
Expand Down
Loading
Loading