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

ingest new Propolis VM creation API #7211

Merged
merged 10 commits into from
Dec 20, 2024
Merged

ingest new Propolis VM creation API #7211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
659d908
pick up new Propolis ensure API in sled agent
gjcolombo Nov 7, 2024
82be58c
sled agent openapi refresh
gjcolombo Nov 8, 2024
1f6ff74
convert Nexus to new sled agent VMM API
gjcolombo Nov 8, 2024
c7c8137
cleanup
gjcolombo Dec 5, 2024
bfa5075
explain pci device number selection
gjcolombo Dec 6, 2024
30cfb17
remove unneeded sled agent param
gjcolombo Dec 6, 2024
9829624
fmt
gjcolombo Dec 18, 2024
6de669f
use SocketAddrV6::into::<SocketAddr>
gjcolombo Dec 19, 2024
72103b1
improve comments/docs; assert more consistently
gjcolombo Dec 20, 2024
f0c692d
PR feedback: SocketAddrV6, misc cleanup
gjcolombo Dec 20, 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
22 changes: 13 additions & 9 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: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,10 +544,10 @@ prettyplease = { version = "0.2.25", features = ["verbatim"] }
proc-macro2 = "1.0"
progenitor = "0.8.0"
progenitor-client = "0.8.0"
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "220a6f367c18f2452dbc4fa9086f3fe73b961739" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "220a6f367c18f2452dbc4fa9086f3fe73b961739" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "220a6f367c18f2452dbc4fa9086f3fe73b961739" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "220a6f367c18f2452dbc4fa9086f3fe73b961739" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "d4529fd8247386b422b78e1203315d5baea5ea8b" }
proptest = "1.5.0"
qorb = "0.2.1"
quote = "1.0"
Expand Down
1 change: 1 addition & 0 deletions clients/sled-agent-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
oxnet.workspace = true
progenitor.workspace = true
propolis-client.workspace = true
regress.workspace = true
reqwest = { workspace = true, features = [ "json", "rustls-tls", "stream" ] }
schemars.workspace = true
Expand Down
2 changes: 2 additions & 0 deletions clients/sled-agent-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ use serde::Serialize;
use std::convert::TryFrom;
use uuid::Uuid;

pub use propolis_client::{CrucibleOpts, VolumeConstructionRequest};

progenitor::generate_api!(
spec = "../../openapi/sled-agent.json",
derives = [schemars::JsonSchema, PartialEq],
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/ls-apis/tests/api_dependencies.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ Oximeter (client: oximeter-client)
consumed by: omicron-nexus (omicron/nexus) via 2 paths

Propolis (client: propolis-client)
consumed by: omicron-nexus (omicron/nexus) via 2 paths
consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path
consumed by: omicron-nexus (omicron/nexus) via 3 paths
consumed by: omicron-sled-agent (omicron/sled-agent) via 2 paths

Crucible Repair (client: repair-client)
consumed by: crucible-downstairs (crucible/downstairs) via 1 path
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/omdb/src/bin/omdb/db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ use omicron_uuid_kinds::InstanceUuid;
use omicron_uuid_kinds::PhysicalDiskUuid;
use omicron_uuid_kinds::PropolisUuid;
use omicron_uuid_kinds::SledUuid;
use sled_agent_client::types::VolumeConstructionRequest;
use sled_agent_client::VolumeConstructionRequest;
use std::borrow::Cow;
use std::cmp::Ordering;
use std::collections::BTreeMap;
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-queries/src/db/datastore/region_replacement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ mod test {

use crate::db::pub_test_utils::TestDatabase;
use omicron_test_utils::dev;
use sled_agent_client::types::VolumeConstructionRequest;
use sled_agent_client::VolumeConstructionRequest;

#[tokio::test]
async fn test_one_replacement_per_volume() {
Expand Down
2 changes: 1 addition & 1 deletion nexus/db-queries/src/db/datastore/region_snapshot_replacement.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1371,7 +1371,7 @@ mod test {
use crate::db::pub_test_utils::TestDatabase;
use omicron_test_utils::dev;
use omicron_uuid_kinds::DatasetUuid;
use sled_agent_client::types::VolumeConstructionRequest;
use sled_agent_client::VolumeConstructionRequest;

#[tokio::test]
async fn test_one_replacement_per_volume() {
Expand Down
Loading
Loading