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

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

Merged
merged 4 commits into from
Nov 14, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc57f20
[spr] initial version
sunshowers Nov 9, 2024
e6f33f8
rebase on main
sunshowers Nov 14, 2024
84ff94c
cleaner output
sunshowers Nov 14, 2024
2dc6988
trailing whitespace
sunshowers Nov 14, 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
47 changes: 44 additions & 3 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.

8 changes: 8 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,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 @@ -209,6 +210,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 @@ -457,6 +459,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 @@ -516,6 +519,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 Expand Up @@ -606,6 +613,7 @@ strum = { version = "0.26", features = [ "derive" ] }
subprocess = "0.2.9"
supports-color = "3.0.1"
swrite = "0.1.0"
sync-ptr = "0.1.1"
libsw = { version = "3.3.1", features = ["tokio"] }
syn = { version = "2.0" }
tabled = "0.15.0"
Expand Down
4 changes: 2 additions & 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,11 @@ chrono.workspace = true
clap.workspace = true
dropshot.workspace = true
humantime.workspace = true
indexmap.workspace = true
indent_write.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 +35,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