Skip to content

Commit 66c9cf8

Browse files
committed
Pull in latest networking dependencies
This updates maghemite, dendrite, and OPTE for the run-up to the IPv6 integration and attached subnet work. It does not actually use any new functionality, but makes a few small API changes required for the OPTE update.
1 parent c765b35 commit 66c9cf8

File tree

15 files changed

+206
-108
lines changed

15 files changed

+206
-108
lines changed

.github/buildomat/jobs/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#:
33
#: name = "helios / deploy"
44
#: variety = "basic"
5-
#: target = "lab-2.0-opte-0.38"
5+
#: target = "lab-2.0-opte-0.39"
66
#: output_rules = [
77
#: "%/var/svc/log/oxide-*.log*",
88
#: "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",

Cargo.lock

Lines changed: 27 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ ntp-admin-api = { path = "ntp-admin/api" }
569569
ntp-admin-client = { path = "clients/ntp-admin-client" }
570570
ntp-admin-types = { path = "ntp-admin/types" }
571571
ntp-admin-types-versions = { path = "ntp-admin/types/versions" }
572-
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "396bb3c570be65f4e8c73ea3243f4af6561a823a" }
573-
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "396bb3c570be65f4e8c73ea3243f4af6561a823a" }
572+
mg-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "3abfb8eb7f6d4ca4658981b4a7a76759a0a3f8ec" }
573+
ddm-admin-client = { git = "https://github.com/oxidecomputer/maghemite", rev = "3abfb8eb7f6d4ca4658981b4a7a76759a0a3f8ec" }
574574
multimap = "0.10.1"
575575
nexus-auth = { path = "nexus/auth" }
576576
nexus-background-task-interface = { path = "nexus/background-task-interface" }
@@ -629,7 +629,7 @@ omicron-workspace-hack = "0.1.0"
629629
omicron-zone-package = "0.12.2"
630630
oxide-client = { path = "clients/oxide-client" }
631631
oxide-tokio-rt = "0.1.2"
632-
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "4bd8a40c0f5c05de7bb29b5f592f2dc99b4fd1d7", features = [ "api", "std" ] }
632+
oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "e547d07b08c3f3d6c821c9eb7a958adcffce6e56", features = [ "api", "std" ] }
633633
oxlog = { path = "dev-tools/oxlog" }
634634
oxnet = "0.1.4"
635635
once_cell = "1.21.3"
@@ -638,7 +638,7 @@ openapiv3 = "2.2.0"
638638
# must match samael's crate!
639639
openssl = "0.10"
640640
openssl-sys = "0.9"
641-
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "4bd8a40c0f5c05de7bb29b5f592f2dc99b4fd1d7" }
641+
opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "e547d07b08c3f3d6c821c9eb7a958adcffce6e56" }
642642
oso = "0.27"
643643
owo-colors = "4.2.2"
644644
oximeter = { path = "oximeter/oximeter" }
@@ -700,7 +700,7 @@ rats-corim = { git = "https://github.com/oxidecomputer/rats-corim.git", rev = "f
700700
raw-cpuid = { git = "https://github.com/oxidecomputer/rust-cpuid.git", rev = "a4cf01df76f35430ff5d39dc2fe470bcb953503b" }
701701
rayon = "1.10"
702702
rcgen = "0.12.1"
703-
rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "396bb3c570be65f4e8c73ea3243f4af6561a823a" }
703+
rdb-types = { git = "https://github.com/oxidecomputer/maghemite", rev = "3abfb8eb7f6d4ca4658981b4a7a76759a0a3f8ec" }
704704
reconfigurator-cli = { path = "dev-tools/reconfigurator-cli" }
705705
reedline = "0.40.0"
706706
ref-cast = "1.0"

illumos-utils/src/opte/mod.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,18 @@ fn router_target_opte(target: &shared::RouterTarget) -> RouterTarget {
148148
}
149149
}
150150

151+
/// Configuration for a subnet attached to an instance's OPTE port.
152+
#[derive(Clone, Copy, Debug)]
153+
pub struct AttachedSubnet {
154+
/// The IP subnet that's attached.
155+
pub cidr: IpCidr,
156+
/// True if this is an external subnet, and false if it's a VPC subnet.
157+
///
158+
/// Traffic destined for external subnets do not undergo NAT in the same way
159+
/// as VPC Subnets.
160+
pub is_external: bool,
161+
}
162+
151163
#[cfg(test)]
152164
mod tests {
153165
use super::Gateway;

illumos-utils/src/opte/non_illumos.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use omicron_common::api::internal::shared::NetworkInterfaceKind;
99
use oxide_vpc::api::AddRouterEntryReq;
1010
use oxide_vpc::api::ClearVirt2PhysReq;
1111
use oxide_vpc::api::DelRouterEntryReq;
12-
use oxide_vpc::api::DhcpCfg;
1312
use oxide_vpc::api::Direction;
1413
use oxide_vpc::api::DumpVirt2PhysResp;
1514
use oxide_vpc::api::IpCfg;
@@ -192,7 +191,6 @@ impl Handle {
192191
&self,
193192
name: &str,
194193
cfg: VpcCfg,
195-
_: DhcpCfg,
196194
_: bool,
197195
) -> Result<NoResp, OpteError> {
198196
let name = name.to_string();

0 commit comments

Comments
 (0)