Skip to content

update reconfigurator-cli, blueprint show, blueprint diff for SP updates#8016

Merged
davepacheco merged 5 commits intomainfrom
dap/sp-update-reconfigurator-cli
Apr 22, 2025
Merged

update reconfigurator-cli, blueprint show, blueprint diff for SP updates#8016
davepacheco merged 5 commits intomainfrom
dap/sp-update-reconfigurator-cli

Conversation

@davepacheco
Copy link
Copy Markdown
Collaborator

This adds support to reconfigurator-cli for configuring SP updates in blueprints. As part of this:

  • the blueprint builder supports changes to pending_mgs_updates
  • blueprint diff now shows changes to pending_mgs_updates
  • we now have tests for basic manipulation of this structure (through the reconfigurator-cli tests)

(follows #7976)

@davepacheco
Copy link
Copy Markdown
Collaborator Author

Don't be put off by the size of the diff. It's almost all in the expected output file of the new reconfigurator-cli test:

$ git diff --stat main
 dev-tools/reconfigurator-cli/src/lib.rs                              |  103 ++-
 dev-tools/reconfigurator-cli/tests/input/cmds-set-mgs-updates.txt    |   42 +
 dev-tools/reconfigurator-cli/tests/output/cmd-set-mgs-updates-stderr |    3 +
 dev-tools/reconfigurator-cli/tests/output/cmd-set-mgs-updates-stdout | 2835 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 dev-tools/reconfigurator-cli/tests/output/cmd-set-zone-images-stdout |   12 +-
 dev-tools/reconfigurator-cli/tests/test_basic.rs                     |   17 +
 nexus/reconfigurator/planning/src/blueprint_builder/builder.rs       |   25 +-
 nexus/types/src/deployment.rs                                        |   24 +-
 nexus/types/src/deployment/blueprint_diff.rs                         |  131 ++-
 nexus/types/src/deployment/blueprint_display.rs                      |   14 +-
 10 files changed, 3175 insertions(+), 31 deletions(-)

Ignoring that file, it's only +340/-31.

@davepacheco davepacheco self-assigned this Apr 21, 2025
@davepacheco davepacheco added this to the 15 milestone Apr 21, 2025
Copy link
Copy Markdown
Contributor

@andrewjstone andrewjstone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! So great to see this coming together.

Comment thread dev-tools/reconfigurator-cli/src/lib.rs Outdated
Comment thread dev-tools/reconfigurator-cli/src/lib.rs Outdated
Comment thread nexus/types/src/deployment/blueprint_display.rs
@davepacheco davepacheco enabled auto-merge (squash) April 21, 2025 23:10
@davepacheco davepacheco merged commit 1fc519e into main Apr 22, 2025
16 checks passed
@davepacheco davepacheco deleted the dap/sp-update-reconfigurator-cli branch April 22, 2025 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants