Pull in latest networking dependencies

.github/buildomat/jobs/deploy.sh

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

Cargo.toml

@@ -569,8 +569,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 = "396bb3c570be65f4e8c73ea3243f4af6561a823a" }
-ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "396bb3c570be65f4e8c73ea3243f4af6561a823a" }
+mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "3abfb8eb7f6d4ca4658981b4a7a76759a0a3f8ec" }
+ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "3abfb8eb7f6d4ca4658981b4a7a76759a0a3f8ec" }
 multimap = "0.10.1"
 nexus-auth = { path = "nexus/auth" }
 nexus-background-task-interface = { path = "nexus/background-task-interface" }
@@ -629,7 +629,7 @@ omicron-workspace-hack = "0.1.0"
 omicron-zone-package = "0.12.2"
 oxide-client = { path = "clients/oxide-client" }
 oxide-tokio-rt = "0.1.2"
-oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "4bd8a40c0f5c05de7bb29b5f592f2dc99b4fd1d7", features = [ "api", "std" ] }
+oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "e547d07b08c3f3d6c821c9eb7a958adcffce6e56", features = [ "api", "std" ] }
 oxlog = { path = "dev-tools/oxlog" }
 oxnet = "0.1.4"
 once_cell = "1.21.3"
@@ -638,7 +638,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 = "4bd8a40c0f5c05de7bb29b5f592f2dc99b4fd1d7" }
+opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "e547d07b08c3f3d6c821c9eb7a958adcffce6e56" }
 oso = "0.27"
 owo-colors = "4.2.2"
 oximeter = { path = "oximeter/oximeter" }
@@ -700,7 +700,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 = "396bb3c570be65f4e8c73ea3243f4af6561a823a" }
+rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "3abfb8eb7f6d4ca4658981b4a7a76759a0a3f8ec" }
 reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" }
 reedline = "0.40.0"
 ref-cast = "1.0"

illumos-utils/src/opte/mod.rs

@@ -148,6 +148,18 @@ fn router_target_opte(target: &shared::RouterTarget) -> RouterTarget {
     }
 }
 
+/// Configuration for a subnet attached to an instance's OPTE port.
+#[derive(Clone, Copy, Debug)]
+pub struct AttachedSubnet {
+    /// The IP subnet that's attached.
+    pub cidr: IpCidr,
+    /// True if this is an external subnet, and false if it's a VPC subnet.
+    ///
+    /// Traffic destined for external subnets do not undergo NAT in the same way
+    /// as VPC Subnets.
+    pub is_external: bool,
+}
+
 #[cfg(test)]
 mod tests {
     use super::Gateway;

illumos-utils/src/opte/non_illumos.rs

@@ -9,7 +9,6 @@ use omicron_common::api::internal::shared::NetworkInterfaceKind;
 use oxide_vpc::api::AddRouterEntryReq;
 use oxide_vpc::api::ClearVirt2PhysReq;
 use oxide_vpc::api::DelRouterEntryReq;
-use oxide_vpc::api::DhcpCfg;
 use oxide_vpc::api::Direction;
 use oxide_vpc::api::DumpVirt2PhysResp;
 use oxide_vpc::api::IpCfg;
@@ -192,7 +191,6 @@ impl Handle {
         &self,
         name: &str,
         cfg: VpcCfg,
-        _: DhcpCfg,
         _: bool,
     ) -> Result<NoResp, OpteError> {
         let name = name.to_string();