Skip to content
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

Jump to bottom

[WIP] [reconfigurator] introduce a simulator, make CLI use it #6856

Draft
wants to merge 3 commits into
base: sunshowers/spr/main.wip-reconfigurator-introduce-a-simulator-make-cli-use-it
Choose a base branch
from
Draft

[WIP] [reconfigurator] introduce a simulator, make CLI use it #6856

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e0625c
[spr] initial version
sunshowers Oct 14, 2024
f8d39dc
rebase + changes
sunshowers Oct 18, 2024
a294701
more fixes
sunshowers Oct 18, 2024
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
36 changes: 34 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ members = [
"nexus/reconfigurator/execution",
"nexus/reconfigurator/planning",
"nexus/reconfigurator/preparation",
"nexus/reconfigurator/simulation",
"nexus/saga-recovery",
"nexus/test-interface",
"nexus/test-utils-macros",
Expand Down Expand Up @@ -202,6 +203,7 @@ default-members = [
"nexus/reconfigurator/execution",
"nexus/reconfigurator/planning",
"nexus/reconfigurator/preparation",
"nexus/reconfigurator/simulation",
"nexus/saga-recovery",
"nexus/test-interface",
"nexus/test-utils-macros",
Expand Down Expand Up @@ -445,6 +447,7 @@ nexus-networking = { path = "nexus/networking" }
nexus-reconfigurator-execution = { path = "nexus/reconfigurator/execution" }
nexus-reconfigurator-planning = { path = "nexus/reconfigurator/planning" }
nexus-reconfigurator-preparation = { path = "nexus/reconfigurator/preparation" }
nexus-reconfigurator-simulation = { path = "nexus/reconfigurator/simulation" }
nexus-saga-recovery = { path = "nexus/saga-recovery" }
nexus-sled-agent-shared = { path = "nexus-sled-agent-shared" }
nexus-test-interface = { path = "nexus/test-interface" }
Expand Down Expand Up @@ -504,6 +507,10 @@ paste = "1.0.15"
percent-encoding = "2.3.1"
peg = "0.8.4"
pem = "3.0"
# petname's default features pull in clap for CLI parsing, which we don't need.
# Note that if you depend on petname, you must also set default-features =
# false: petname = { workspace = true, default-features = false }.
petname = { version = "2.0.2", default-features = false, features = ["default-rng", "default-words"] }
petgraph = "0.6.5"
postgres-protocol = "0.6.7"
predicates = "3.1.2"
Expand Down
3 changes: 1 addition & 2 deletions dev-tools/reconfigurator-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ chrono.workspace = true
clap.workspace = true
dropshot.workspace = true
humantime.workspace = true
indexmap.workspace = true
internal-dns-types.workspace = true
nexus-inventory.workspace = true
nexus-reconfigurator-planning.workspace = true
nexus-reconfigurator-simulation.workspace = true
nexus-sled-agent-shared.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
Expand All @@ -34,7 +34,6 @@ slog-error-chain.workspace = true
slog.workspace = true
swrite.workspace = true
tabled.workspace = true
typed-rng.workspace = true
uuid.workspace = true
omicron-workspace-hack.workspace = true

Expand Down
Loading
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.