merge main into multicast-e2e

Author: zeeshanlakhani

Cargo.lock

@@ -75,6 +75,7 @@ members = [
     "internal-dns/types/versions",
     "ipcc",
     "key-manager",
+    "key-manager/types",
     "live-tests",
     "live-tests/macros",
     "nexus",
@@ -110,6 +111,7 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "nexus/types/versions",
     "ntp-admin",
     "ntp-admin/api",
     "ntp-admin/types",
@@ -250,6 +252,7 @@ default-members = [
     "internal-dns/types/versions",
     "ipcc",
     "key-manager",
+    "key-manager/types",
     "live-tests",
     "live-tests/macros",
     "nexus",
@@ -285,6 +288,7 @@ default-members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
+    "nexus/types/versions",
     "ntp-admin",
     "ntp-admin/api",
     "ntp-admin/types",
@@ -560,6 +564,7 @@ ipnetwork = { version = "0.21", features = ["schemars", "serde"] }
 ispf = { git = "https://github.com/oxidecomputer/ispf" }
 jiff = "0.2.15"
 key-manager = { path = "key-manager" }
+key-manager-types = { path = "key-manager/types" }
 kstat-rs = "0.2.4"
 libc = "0.2.174"
 libipcc = { git = "https://github.com/oxidecomputer/ipcc-rs", rev = "524eb8f125003dff50b9703900c6b323f00f9e1b" }
@@ -610,6 +615,7 @@ nexus-test-interface = { path = "nexus/test-interface" }
 nexus-test-utils-macros = { path = "nexus/test-utils-macros" }
 nexus-test-utils = { path = "nexus/test-utils" }
 nexus-types = { path = "nexus/types" }
+nexus-types-versions = { path = "nexus/types/versions" }
 nix = { version = "0.30", features = ["fs", "net"] }
 nom = "7.1.3"
 nonempty = "0.12.0"
@@ -687,10 +693,10 @@ progenitor-client = "0.10.0"
 # NOTE: if you change the pinned revision of the `bhyve_api` and propolis
 # dependencies, you must also update the references in package-manifest.toml to
 # match the new revision.
-bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "bc121ef55741656ce118b02ceeda949b9261f49f" }
-propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "bc121ef55741656ce118b02ceeda949b9261f49f" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "bc121ef55741656ce118b02ceeda949b9261f49f" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "bc121ef55741656ce118b02ceeda949b9261f49f" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
+propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "36f20be9bb4c3b362029237f5feb6377c982395f" }
 # NOTE: see above!
 proptest = "1.7.0"
 qorb = "0.4.1"
@@ -774,10 +780,10 @@ slog-term = "2.9.1"
 smf = "0.2"
 socket2 = { version = "0.5", features = ["all"] }
 sp-sim = { path = "sp-sim" }
-sprockets-tls = { git = "https://github.com/oxidecomputer/sprockets.git", rev = "8ba93f6e785e11175059b3303bfd7e8b52ad12f8" }
-sprockets-tls-test-utils = { git = "https://github.com/oxidecomputer/sprockets.git", rev = "8ba93f6e785e11175059b3303bfd7e8b52ad12f8" }
+sprockets-tls = { git = "https://github.com/oxidecomputer/sprockets.git", rev = "d2b68e4f47e3c22bce0455aeb4cfb2e61ad229ba" }
+sprockets-tls-test-utils = { git = "https://github.com/oxidecomputer/sprockets.git", rev = "d2b68e4f47e3c22bce0455aeb4cfb2e61ad229ba" }
 sqlformat = "0.3.5"
-sqlparser = { version = "0.45.0", features = [ "visitor" ] }
+sqlparser = { version = "0.61.0", features = [ "visitor" ] }
 static_assertions = "1.1.0"
 # Please do not change the Steno version to a Git dependency.  It makes it
 # harder than expected to make breaking changes (even if you specify a specific

Cargo.toml

@@ -266,8 +266,8 @@ impl TryFrom<types::ProducerEndpoint>
     }
 }
 
-impl From<nexus_types::external_api::shared::Baseboard> for types::Baseboard {
-    fn from(value: nexus_types::external_api::shared::Baseboard) -> Self {
+impl From<nexus_types::external_api::hardware::Baseboard> for types::Baseboard {
+    fn from(value: nexus_types::external_api::hardware::Baseboard) -> Self {
         types::Baseboard {
             part: value.part,
             revision: value.revision,

clients/nexus-client/src/lib.rs

@@ -201,70 +201,6 @@ impl From<types::MigrationState>
     }
 }
 
-impl From<omicron_common::api::internal::nexus::DiskRuntimeState>
-    for types::DiskRuntimeState
-{
-    fn from(s: omicron_common::api::internal::nexus::DiskRuntimeState) -> Self {
-        Self {
-            disk_state: s.disk_state.into(),
-            r#gen: s.generation,
-            time_updated: s.time_updated,
-        }
-    }
-}
-
-impl From<omicron_common::api::external::DiskState> for types::DiskState {
-    fn from(s: omicron_common::api::external::DiskState) -> Self {
-        use omicron_common::api::external::DiskState::*;
-        match s {
-            Creating => Self::Creating,
-            Detached => Self::Detached,
-            ImportReady => Self::ImportReady,
-            ImportingFromUrl => Self::ImportingFromUrl,
-            ImportingFromBulkWrites => Self::ImportingFromBulkWrites,
-            Finalizing => Self::Finalizing,
-            Maintenance => Self::Maintenance,
-            Attaching(u) => Self::Attaching(u),
-            Attached(u) => Self::Attached(u),
-            Detaching(u) => Self::Detaching(u),
-            Destroyed => Self::Destroyed,
-            Faulted => Self::Faulted,
-        }
-    }
-}
-
-impl From<types::DiskRuntimeState>
-    for omicron_common::api::internal::nexus::DiskRuntimeState
-{
-    fn from(s: types::DiskRuntimeState) -> Self {
-        Self {
-            disk_state: s.disk_state.into(),
-            generation: s.r#gen,
-            time_updated: s.time_updated,
-        }
-    }
-}
-
-impl From<types::DiskState> for omicron_common::api::external::DiskState {
-    fn from(s: types::DiskState) -> Self {
-        use types::DiskState::*;
-        match s {
-            Creating => Self::Creating,
-            Detached => Self::Detached,
-            ImportReady => Self::ImportReady,
-            ImportingFromUrl => Self::ImportingFromUrl,
-            ImportingFromBulkWrites => Self::ImportingFromBulkWrites,
-            Finalizing => Self::Finalizing,
-            Maintenance => Self::Maintenance,
-            Attaching(u) => Self::Attaching(u),
-            Attached(u) => Self::Attached(u),
-            Detaching(u) => Self::Detaching(u),
-            Destroyed => Self::Destroyed,
-            Faulted => Self::Faulted,
-        }
-    }
-}
-
 impl From<omicron_common::api::external::L4PortRange> for types::L4PortRange {
     fn from(s: omicron_common::api::external::L4PortRange) -> Self {
         Self::try_from(s.to_string()).unwrap_or_else(|e| panic!("{}: {}", s, e))

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

@@ -586,6 +586,9 @@ mod tests {
                 .arg("[::1]:0")
                 .arg("--http-addr")
                 .arg("[::1]:0")
+                // See https://github.com/oxidecomputer/omicron-9874-findings for
+                // why we set the max SQL memory to be 256MiB.
+                .arg("--max-sql-memory=256MiB")
                 .arg("--join")
                 .arg("[::1]:0");
 

cockroach-admin/src/cockroach_cli.rs

@@ -54,7 +54,6 @@ pub use rack_init::BfdPeerConfig;
 pub use rack_init::BgpConfig;
 pub use rack_init::BgpPeerConfig;
 pub use rack_init::ExternalPortDiscovery;
-pub use rack_init::HostPortConfig;
 pub use rack_init::LldpAdminStatus;
 pub use rack_init::LldpPortConfig;
 pub use rack_init::ParseLldpAdminStatusError;
@@ -65,7 +64,6 @@ pub use rack_init::PortSpeed;
 pub use rack_init::RackNetworkConfig;
 pub use rack_init::RouteConfig;
 pub use rack_init::SwitchLocation;
-pub use rack_init::SwitchPorts;
 pub use rack_init::TxEqConfig;
 pub use rack_init::UplinkAddressConfig;
 pub use rack_init::UplinkAddressConfigError;

common/src/api/internal/shared/mod.rs

@@ -3,13 +3,11 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use super::BgpPeerConfig;
-use super::HostPortConfig;
 use super::LldpAdminStatus;
 use super::MaxPathConfig;
 use super::MaxPathConfigError;
 use super::ParseLldpAdminStatusError;
 use super::ParseSwitchLocationError;
-use super::PortConfig;
 use super::PortFec;
 use super::PortSpeed;
 use super::RouterLifetimeConfig;
@@ -196,17 +194,6 @@ impl FromStr for LldpAdminStatus {
     }
 }
 
-impl From<PortConfig> for HostPortConfig {
-    fn from(x: PortConfig) -> Self {
-        Self {
-            port: x.port,
-            addrs: x.addresses,
-            lldp: x.lldp.clone(),
-            tx_eq: x.tx_eq,
-        }
-    }
-}
-
 impl SwitchLocation {
     /// Return the location of the other switch, not ourself.
     pub const fn other(&self) -> Self {

common/src/api/internal/shared/rack_init/impls.rs

@@ -25,13 +25,11 @@ pub use v1::TxEqConfig;
 
 pub use v2::BgpConfig;
 pub use v2::BgpPeerConfig;
-pub use v2::HostPortConfig;
 pub use v2::MaxPathConfig;
 pub use v2::MaxPathConfigError;
 pub use v2::PortConfig;
 pub use v2::RackNetworkConfig;
 pub use v2::RouterLifetimeConfig;
 pub use v2::RouterLifetimeConfigError;
-pub use v2::SwitchPorts;
 pub use v2::UplinkAddressConfig;
 pub use v2::UplinkAddressConfigError;

common/src/api/internal/shared/rack_init/mod.rs

@@ -225,25 +225,6 @@ pub struct PortConfig {
     pub tx_eq: Option<TxEqConfig>,
 }
 
-/// A set of switch uplinks.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct SwitchPorts {
-    pub uplinks: Vec<HostPortConfig>,
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
-pub struct HostPortConfig {
-    /// Switchport to use for external connectivity
-    pub port: String,
-
-    /// IP Address and prefix (e.g., `192.168.0.1/16`) to apply to switchport
-    /// (must be in infra_ip pool).  May also include an optional VLAN ID.
-    pub addrs: Vec<UplinkAddressConfig>,
-
-    pub lldp: Option<LldpPortConfig>,
-    pub tx_eq: Option<TxEqConfig>,
-}
-
 /// Identifies switch physical location
 #[derive(
     Clone,

common/src/api/internal/shared/rack_init/v1.rs

@@ -337,40 +337,3 @@ pub enum RouterLifetimeConfigError {
     )]
     ParseIntError(#[from] std::num::ParseIntError),
 }
-
-/// A set of switch uplinks.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]
-pub struct SwitchPorts {
-    pub uplinks: Vec<HostPortConfig>,
-}
-
-impl From<super::v1::SwitchPorts> for SwitchPorts {
-    fn from(value: super::v1::SwitchPorts) -> Self {
-        Self { uplinks: value.uplinks.into_iter().map(From::from).collect() }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, JsonSchema)]
-pub struct HostPortConfig {
-    /// Switchport to use for external connectivity
-    pub port: String,
-
-    /// IP Address and prefix (e.g., `192.168.0.1/16`) to apply to switchport
-    /// (must be in infra_ip pool).  May also include an optional VLAN ID.
-    pub addrs: Vec<UplinkAddressConfig>,
-
-    pub lldp: Option<LldpPortConfig>,
-
-    pub tx_eq: Option<TxEqConfig>,
-}
-
-impl From<super::v1::HostPortConfig> for HostPortConfig {
-    fn from(value: super::v1::HostPortConfig) -> Self {
-        Self {
-            port: value.port,
-            addrs: value.addrs.into_iter().map(From::from).collect(),
-            lldp: value.lldp,
-            tx_eq: value.tx_eq,
-        }
-    }
-}