merge main (opte 40, type moves, omdb multicast feature)

Author: zeeshanlakhani

.github/buildomat/jobs/deploy.sh

@@ -2,7 +2,7 @@
 #:
 #: name = "helios / deploy"
 #: variety = "basic"
-#: target = "lab-2.0-opte-0.39"
+#: target = "lab-2.0-opte-0.40"
 #: output_rules = [
 #:  "%/var/svc/log/oxide-*.log*",
 #:  "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",

Cargo.lock

@@ -599,8 +599,8 @@ ntp-admin-api = { path = "ntp-admin/api" }
 ntp-admin-client = { path = "clients/ntp-admin-client" }
 ntp-admin-types = { path = "ntp-admin/types" }
 ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
-mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "58a19139aa83aa31e3e1ac84e68a678643433b57" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "58a19139aa83aa31e3e1ac84e68a678643433b57" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "4d1f20f793da102b29b914569725ebc9fdf746dd" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "4d1f20f793da102b29b914569725ebc9fdf746dd" }
 multimap = "0.10.1"
 nexus-auth = { path = "nexus/auth" }
 nexus-background-task-interface = { path = "nexus/background-task-interface" }
@@ -662,7 +662,7 @@ omicron-workspace-hack = "0.1.0"
 omicron-zone-package = "0.12.2"
 oxide-client = { path = "clients/oxide-client" }
 oxide-tokio-rt = "0.1.4"
-oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "e547d07b08c3f3d6c821c9eb7a958adcffce6e56", features = [ "api", "std" ] }
+oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "bae0440c199b3908c12903a9532854936353433b", features = [ "api", "std" ] }
 oxlog = { path = "dev-tools/oxlog" }
 oxnet = "0.1.4"
 once_cell = "1.21.3"
@@ -671,7 +671,7 @@ openapiv3 = "2.2.0"
 # must match samael's crate!
 openssl = "0.10"
 openssl-sys = "0.9"
-opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "e547d07b08c3f3d6c821c9eb7a958adcffce6e56" }
+opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "bae0440c199b3908c12903a9532854936353433b" }
 oso = "0.27"
 owo-colors = "4.2.2"
 oximeter = { path = "oximeter/oximeter" }
@@ -737,7 +737,7 @@ rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f
 raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" }
 rayon = "1.10"
 rcgen = "0.12.1"
-rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "58a19139aa83aa31e3e1ac84e68a678643433b57" }
+rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "4d1f20f793da102b29b914569725ebc9fdf746dd" }
 reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" }
 reedline = "0.40.0"
 ref-cast = "1.0"

Cargo.toml

@@ -22,5 +22,7 @@ reqwest = { workspace = true, features = ["rustls", "stream"] }
 schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
+sled-agent-types-versions.workspace = true
+sled-agent-types.workspace = true
 slog.workspace = true
 uuid.workspace = true

clients/nexus-client/Cargo.toml

@@ -29,8 +29,8 @@ progenitor::generate_api!(
         Generation = omicron_common::api::external::Generation,
         MacAddr = omicron_common::api::external::MacAddr,
         Name = omicron_common::api::external::Name,
-        NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
-        NetworkInterfaceKind = omicron_common::api::internal::shared::NetworkInterfaceKind,
+        NetworkInterface = sled_agent_types::inventory::NetworkInterface,
+        NetworkInterfaceKind = sled_agent_types::inventory::NetworkInterfaceKind,
     },
     patch = {
         SledAgentInfo = { derives = [PartialEq, Eq] },
@@ -72,9 +72,11 @@ impl From<types::DiskState> for omicron_common::api::external::DiskState {
     }
 }
 
-impl From<omicron_common::api::internal::nexus::VmmState> for types::VmmState {
-    fn from(s: omicron_common::api::internal::nexus::VmmState) -> Self {
-        use omicron_common::api::internal::nexus::VmmState as Input;
+impl From<sled_agent_types_versions::v1::instance::VmmState>
+    for types::VmmState
+{
+    fn from(s: sled_agent_types_versions::v1::instance::VmmState) -> Self {
+        use sled_agent_types_versions::v1::instance::VmmState as Input;
         match s {
             Input::Starting => types::VmmState::Starting,
             Input::Running => types::VmmState::Running,
@@ -88,9 +90,11 @@ impl From<omicron_common::api::internal::nexus::VmmState> for types::VmmState {
     }
 }
 
-impl From<types::VmmState> for omicron_common::api::internal::nexus::VmmState {
+impl From<types::VmmState>
+    for sled_agent_types_versions::v1::instance::VmmState
+{
     fn from(s: types::VmmState) -> Self {
-        use omicron_common::api::internal::nexus::VmmState as Output;
+        use sled_agent_types_versions::v1::instance::VmmState as Output;
         match s {
             types::VmmState::Starting => Output::Starting,
             types::VmmState::Running => Output::Running,
@@ -104,10 +108,12 @@ impl From<types::VmmState> for omicron_common::api::internal::nexus::VmmState {
     }
 }
 
-impl From<omicron_common::api::internal::nexus::VmmRuntimeState>
+impl From<sled_agent_types_versions::v1::instance::VmmRuntimeState>
     for types::VmmRuntimeState
 {
-    fn from(s: omicron_common::api::internal::nexus::VmmRuntimeState) -> Self {
+    fn from(
+        s: sled_agent_types_versions::v1::instance::VmmRuntimeState,
+    ) -> Self {
         Self {
             gen_: s.generation,
             state: s.state.into(),
@@ -116,10 +122,10 @@ impl From<omicron_common::api::internal::nexus::VmmRuntimeState>
     }
 }
 
-impl From<omicron_common::api::internal::nexus::SledVmmState>
+impl From<sled_agent_types_versions::v1::instance::SledVmmState>
     for types::SledVmmState
 {
-    fn from(s: omicron_common::api::internal::nexus::SledVmmState) -> Self {
+    fn from(s: sled_agent_types_versions::v1::instance::SledVmmState) -> Self {
         Self {
             vmm_state: s.vmm_state.into(),
             migration_in: s.migration_in.map(Into::into),
@@ -128,11 +134,11 @@ impl From<omicron_common::api::internal::nexus::SledVmmState>
     }
 }
 
-impl From<omicron_common::api::internal::nexus::MigrationRuntimeState>
+impl From<sled_agent_types_versions::v1::instance::MigrationRuntimeState>
     for types::MigrationRuntimeState
 {
     fn from(
-        s: omicron_common::api::internal::nexus::MigrationRuntimeState,
+        s: sled_agent_types_versions::v1::instance::MigrationRuntimeState,
     ) -> Self {
         Self {
             migration_id: s.migration_id,
@@ -143,11 +149,13 @@ impl From<omicron_common::api::internal::nexus::MigrationRuntimeState>
     }
 }
 
-impl From<omicron_common::api::internal::nexus::MigrationState>
+impl From<sled_agent_types_versions::v1::instance::MigrationState>
     for types::MigrationState
 {
-    fn from(s: omicron_common::api::internal::nexus::MigrationState) -> Self {
-        use omicron_common::api::internal::nexus::MigrationState as Input;
+    fn from(
+        s: sled_agent_types_versions::v1::instance::MigrationState,
+    ) -> Self {
+        use sled_agent_types_versions::v1::instance::MigrationState as Input;
         match s {
             Input::Pending => Self::Pending,
             Input::InProgress => Self::InProgress,

clients/nexus-client/src/lib.rs

@@ -56,8 +56,8 @@ progenitor::generate_api!(
         MacAddr = omicron_common::api::external::MacAddr,
         MgsUpdateDriverStatus = nexus_types::internal_api::views::MgsUpdateDriverStatus,
         Name = omicron_common::api::external::Name,
-        NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
-        NetworkInterfaceKind = omicron_common::api::internal::shared::NetworkInterfaceKind,
+        NetworkInterface = sled_agent_types::inventory::NetworkInterface,
+        NetworkInterfaceKind = sled_agent_types::inventory::NetworkInterfaceKind,
         NewPasswordHash = omicron_passwords::NewPasswordHash,
         OximeterReadMode = nexus_types::deployment::OximeterReadMode,
         OximeterReadPolicy = nexus_types::deployment::OximeterReadPolicy,
@@ -140,12 +140,10 @@ impl From<omicron_common::address::Ipv6Range> for types::Ipv6Range {
     }
 }
 
-impl From<&omicron_common::api::internal::shared::SourceNatConfigGeneric>
+impl From<&sled_agent_types::inventory::SourceNatConfigGeneric>
     for types::SourceNatConfigGeneric
 {
-    fn from(
-        r: &omicron_common::api::internal::shared::SourceNatConfigGeneric,
-    ) -> Self {
+    fn from(r: &sled_agent_types::inventory::SourceNatConfigGeneric) -> Self {
         let (first_port, last_port) = r.port_range_raw();
         Self { ip: r.ip, first_port, last_port }
     }