fix up CI and rebase

Created using spr 1.3.6-beta.1

.github/buildomat/jobs/package.sh

@@ -28,7 +28,7 @@ ptime -m cargo xtask download softnpu
 # Build the test target
 export CARGO_INCREMENTAL=0
 ptime -m cargo run --locked --release --bin omicron-package -- \
-  -t test target create -i standard -m non-gimlet -s softnpu -r single-sled
+  -t test target create -p dev
 ptime -m cargo run --locked --release --bin omicron-package -- \
   -t test package
 mapfile -t packages \

.github/workflows/rust.yml

@@ -53,7 +53,7 @@ jobs:
     - name: Install Pre-Requisites
       run: ./tools/install_builder_prerequisites.sh -y
     - name: Set default target
-      run: cargo run --bin omicron-package -- -t default target create -r single-sled
+      run: cargo run --bin omicron-package -- -t default target create --preset dev
     - name: Check build of deployed Omicron packages
       run: cargo run --bin omicron-package -- -t default check
 

Cargo.toml

@@ -79,6 +79,7 @@ members = [
     "nexus/macros-common",
     "nexus/metrics-producer-gc",
     "nexus/networking",
+    "nexus/reconfigurator/blippy",
     "nexus/reconfigurator/execution",
     "nexus/reconfigurator/planning",
     "nexus/reconfigurator/preparation",
@@ -213,6 +214,7 @@ default-members = [
     "nexus/macros-common",
     "nexus/metrics-producer-gc",
     "nexus/networking",
+    "nexus/reconfigurator/blippy",
     "nexus/reconfigurator/execution",
     "nexus/reconfigurator/planning",
     "nexus/reconfigurator/preparation",
@@ -468,6 +470,7 @@ nexus-internal-api = { path = "nexus/internal-api" }
 nexus-macros-common = { path = "nexus/macros-common" }
 nexus-metrics-producer-gc = { path = "nexus/metrics-producer-gc" }
 nexus-networking = { path = "nexus/networking" }
+nexus-reconfigurator-blippy = { path = "nexus/reconfigurator/blippy" }
 nexus-reconfigurator-execution = { path = "nexus/reconfigurator/execution" }
 nexus-reconfigurator-planning = { path = "nexus/reconfigurator/planning" }
 nexus-reconfigurator-preparation = { path = "nexus/reconfigurator/preparation" }
@@ -495,7 +498,7 @@ omicron-rpaths = { path = "rpaths" }
 omicron-sled-agent = { path = "sled-agent" }
 omicron-test-utils = { path = "test-utils" }
 omicron-workspace-hack = "0.1.0"
-omicron-zone-package = "0.11.1"
+omicron-zone-package = "0.12.0"
 oxide-client = { path = "clients/oxide-client" }
 oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "b56afeeb14e0042cbd7bda85b166ed86ee17820e", features = [ "api", "std" ] }
 oxlog = { path = "dev-tools/oxlog" }
@@ -544,10 +547,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"
@@ -838,8 +841,7 @@ opt-level = 3
 #
 #[patch."crates-io"]
 #dropshot = { path = "../dropshot/dropshot" }
-[patch.crates-io]
-omicron-zone-package = { path = "../omicron-package" }
+#[patch.crates-io]
 #steno = { path = "../steno" }
 # [patch."https://github.com/oxidecomputer/propolis"]
 # propolis-client = { path = "../propolis/lib/propolis-client" }

clients/dpd-client/build.rs

@@ -14,12 +14,16 @@ use anyhow::bail;
 use anyhow::Context;
 use anyhow::Result;
 use omicron_zone_package::config::Config;
+use omicron_zone_package::config::PackageName;
 use omicron_zone_package::package::PackageSource;
 use quote::quote;
 use std::env;
 use std::fs;
 use std::path::Path;
 
+const DENDRITE_ASIC_PACKAGE: PackageName =
+    PackageName::new_const("dendrite-asic");
+
 fn main() -> Result<()> {
     // Find the current dendrite repo commit from our package manifest.
     let manifest = fs::read_to_string("../../package-manifest.toml")
@@ -31,7 +35,7 @@ fn main() -> Result<()> {
 
     let dendrite = config
         .packages
-        .get("dendrite-asic")
+        .get(&DENDRITE_ASIC_PACKAGE)
         .context("missing dendrite package in ../../package-manifest.toml")?;
 
     let local_path = match &dendrite.source {

clients/sled-agent-client/Cargo.toml

@@ -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

clients/sled-agent-client/src/lib.rs

@@ -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],

common/src/api/external/mod.rs

@@ -1930,6 +1930,8 @@ impl JsonSchema for L4PortRange {
     DeserializeFromStr,
     PartialEq,
     Eq,
+    PartialOrd,
+    Ord,
     SerializeDisplay,
     Hash,
 )]

common/src/api/internal/shared.rs

@@ -48,7 +48,16 @@ pub enum NetworkInterfaceKind {
 
 /// Information required to construct a virtual network interface
 #[derive(
-    Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash,
+    Clone,
+    Debug,
+    Deserialize,
+    Serialize,
+    JsonSchema,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
 )]
 pub struct NetworkInterface {
     pub id: Uuid,
@@ -68,7 +77,18 @@ pub struct NetworkInterface {
 /// outbound network connections from guests or services.
 // Note that `Deserialize` is manually implemented; if you make any changes to
 // the fields of this structure, you must make them to that implementation too.
-#[derive(Debug, Clone, Copy, Serialize, JsonSchema, PartialEq, Eq, Hash)]
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    Serialize,
+    JsonSchema,
+    PartialEq,
+    Eq,
+    PartialOrd,
+    Ord,
+    Hash,
+)]
 pub struct SourceNatConfig {
     /// The external address provided to the instance or service.
     pub ip: IpAddr,

dev-tools/ls-apis/tests/api_dependencies.out

@@ -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

dev-tools/omdb/src/bin/omdb/db.rs

@@ -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;