Skip to content

Commit 093b411

Browse files
default multicast feature across all crates + merge main (includes #189)
2 parents 17abdd7 + a9d4b82 commit 093b411

33 files changed

Lines changed: 24298 additions & 1126 deletions

Cargo.lock

Lines changed: 305 additions & 153 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch= "ma
5151
oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
5252
oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "main" }
5353
oximeter-instruments = { git = "https://github.com/oxidecomputer/omicron", branch = "main", default-features = false, features = ["kstat"] }
54-
oxnet = { version = "0.1.3", default-features = false, features = ["schemars", "serde"] }
54+
oxnet = { version = "0.1.4", default-features = false, features = ["schemars", "serde"] }
5555
propolis = { git = "https://github.com/oxidecomputer/propolis" }
5656
smf = { git = "https://github.com/illumos/smf-rs" }
5757
softnpu-lib = { git = "https://github.com/oxidecomputer/softnpu" , package = "softnpu" , branch = "main"}
@@ -69,7 +69,7 @@ colored = "3"
6969
csv = "1.3"
7070
curl = "0.4"
7171
display-error-chain = "0.2"
72-
dropshot = "0.16.4"
72+
dropshot = "0.16.6"
7373
dropshot-api-manager = "0.2.2"
7474
dropshot-api-manager-types = "0.2.2"
7575
expectorate = "1"
@@ -85,11 +85,12 @@ oxide-tokio-rt = "0.1.2"
8585
parking_lot = "0.12"
8686
pretty_assertions = "1.4"
8787
proc-macro2 = "1.0"
88-
progenitor = "0.11"
88+
progenitor = "0.13"
8989
rand = "0.9"
9090
regex = "1.12"
9191
regress = "0.10"
92-
reqwest = { version = "0.12", default-features = false }
92+
reqwest = { version = "0.13", default-features = false }
93+
reqwest012 = { package = "reqwest", version = "0.12", default-features = false }
9394
schemars = "0.8"
9495
semver = "1.0"
9596
serde = { version = "1.0", features = ["derive"] }
@@ -115,5 +116,3 @@ internet-checksum = "0.2"
115116
# It's common during development to use a local copy of various complex
116117
# dependencies. If you want to use those, uncomment one of these blocks.
117118
#
118-
# [patch."https://github.com/oxidecomputer/omicron"]
119-
# oximeter = { path = "../omicron/oximeter/oximeter" }

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,5 +341,14 @@ proxy_arp:
341341
3. run `SDE=/opt/oxide/tofino_sde cargo test --features=<feature>` to execute
342342
the tests.
343343

344-
If regenerating the openapi specifications, set `EXPECTORATE=overwrite` when
345-
runnning the tests with the `tofino_asic` feature.
344+
### OpenAPI Generation
345+
346+
`dpd-api/src/lib.rs` contains endpoint [dropshot][dropshot-gh] definitions and
347+
controls API versioning for the `dpd` OpenAPI interface. If you add/remove or
348+
edit API points and/or documentation, you can update the API version and
349+
regenerate the latest OpenAPI specification bindings by running
350+
`cargo xtask openapi generate`. Use `cargo xtask openapi check` to verify
351+
specs are up-to-date.
352+
353+
354+
[dropshot-gh]: https://github.com/oxidecomputer/dropshot

0 commit comments

Comments
 (0)