From 86352aec6c3cc5bacd15feec4630e15dcc034278 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 10 Jan 2023 11:56:54 -0800 Subject: [PATCH 1/3] rev opte to get to a stable build --- Cargo.lock | 13 +++++++------ Cargo.toml | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edf5e1c8d49..4f5c26bc6f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2488,7 +2488,7 @@ dependencies = [ [[package]] name = "illumos-sys-hdrs" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=23fdf5856f10f23e2d26865d2d7e2d3bc537bca3#23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" +source = "git+https://github.com/oxidecomputer/opte?rev=f501445f5a6c275c79f08a876fff6a861df31d46#f501445f5a6c275c79f08a876fff6a861df31d46" [[package]] name = "impl-trait-for-tuples" @@ -2747,7 +2747,7 @@ checksum = "f9b7d56ba4a8344d6be9729995e6b06f928af29998cdf79fe390cbf6b1fee838" [[package]] name = "kstat-macro" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=23fdf5856f10f23e2d26865d2d7e2d3bc537bca3#23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" +source = "git+https://github.com/oxidecomputer/opte?rev=f501445f5a6c275c79f08a876fff6a861df31d46#f501445f5a6c275c79f08a876fff6a861df31d46" dependencies = [ "quote", "syn", @@ -3770,7 +3770,7 @@ dependencies = [ [[package]] name = "opte" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=23fdf5856f10f23e2d26865d2d7e2d3bc537bca3#23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" +source = "git+https://github.com/oxidecomputer/opte?rev=f501445f5a6c275c79f08a876fff6a861df31d46#f501445f5a6c275c79f08a876fff6a861df31d46" dependencies = [ "cfg-if 0.1.10", "dyn-clone", @@ -3781,13 +3781,14 @@ dependencies = [ "postcard", "serde", "smoltcp", + "version_check", "zerocopy 0.6.1", ] [[package]] name = "opte-api" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=23fdf5856f10f23e2d26865d2d7e2d3bc537bca3#23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" +source = "git+https://github.com/oxidecomputer/opte?rev=f501445f5a6c275c79f08a876fff6a861df31d46#f501445f5a6c275c79f08a876fff6a861df31d46" dependencies = [ "cfg-if 0.1.10", "illumos-sys-hdrs", @@ -3799,7 +3800,7 @@ dependencies = [ [[package]] name = "opte-ioctl" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=23fdf5856f10f23e2d26865d2d7e2d3bc537bca3#23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" +source = "git+https://github.com/oxidecomputer/opte?rev=f501445f5a6c275c79f08a876fff6a861df31d46#f501445f5a6c275c79f08a876fff6a861df31d46" dependencies = [ "libc", "libnet", @@ -3861,7 +3862,7 @@ dependencies = [ [[package]] name = "oxide-vpc" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/opte?rev=23fdf5856f10f23e2d26865d2d7e2d3bc537bca3#23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" +source = "git+https://github.com/oxidecomputer/opte?rev=f501445f5a6c275c79f08a876fff6a861df31d46#f501445f5a6c275c79f08a876fff6a861df31d46" dependencies = [ "cfg-if 0.1.10", "illumos-sys-hdrs", diff --git a/Cargo.toml b/Cargo.toml index 972d281abc7..09893bf1c13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -158,7 +158,7 @@ omicron-package = { path = "package" } omicron-sled-agent = { path = "sled-agent" } omicron-test-utils = { path = "test-utils" } omicron-zone-package = "0.5.1" -oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "23fdf5856f10f23e2d26865d2d7e2d3bc537bca3", features = [ "api", "std" ] } +oxide-vpc = { git = "https://github.com/oxidecomputer/opte", rev = "f501445f5a6c275c79f08a876fff6a861df31d46", features = [ "api", "std" ] } once_cell = "1.17.0" openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" } openapiv3 = "1.0" @@ -166,7 +166,7 @@ openapiv3 = "1.0" openssl = "0.10" openssl-sys = "0.9" openssl-probe = "0.1.2" -opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "23fdf5856f10f23e2d26865d2d7e2d3bc537bca3" } +opte-ioctl = { git = "https://github.com/oxidecomputer/opte", rev = "f501445f5a6c275c79f08a876fff6a861df31d46" } oso = "0.26" oximeter = { path = "oximeter/oximeter" } oximeter-client = { path = "oximeter-client" } From 1ea50ee8f2b33e0f0c891e612010f22859047a38 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 10 Jan 2023 12:45:54 -0800 Subject: [PATCH 2/3] updates --- sled-agent/src/opte/illumos/firewall_rules.rs | 2 +- sled-agent/src/opte/illumos/port_manager.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sled-agent/src/opte/illumos/firewall_rules.rs b/sled-agent/src/opte/illumos/firewall_rules.rs index c3332f5d9bb..b7679c57209 100644 --- a/sled-agent/src/opte/illumos/firewall_rules.rs +++ b/sled-agent/src/opte/illumos/firewall_rules.rs @@ -12,10 +12,10 @@ use omicron_common::api::external::VpcFirewallRuleAction; use omicron_common::api::external::VpcFirewallRuleDirection; use omicron_common::api::external::VpcFirewallRuleProtocol; use omicron_common::api::external::VpcFirewallRuleStatus; -use oxide_vpc::api::Action; use oxide_vpc::api::Address; use oxide_vpc::api::Direction; use oxide_vpc::api::Filters; +use oxide_vpc::api::FirewallAction; use oxide_vpc::api::FirewallRule; use oxide_vpc::api::Ipv4Cidr; use oxide_vpc::api::Ipv4PrefixLen; diff --git a/sled-agent/src/opte/illumos/port_manager.rs b/sled-agent/src/opte/illumos/port_manager.rs index 9fa694f1aff..70f7e1f95f8 100644 --- a/sled-agent/src/opte/illumos/port_manager.rs +++ b/sled-agent/src/opte/illumos/port_manager.rs @@ -278,7 +278,7 @@ impl PortManager { snat, external_ips: external_ip, }), - private_mac: MacAddr::from(mac.into_array()), + guest_mac: MacAddr::from(mac.into_array()), gateway_mac: MacAddr::from(gateway.mac.into_array()), vni, phys_ip: self.inner.underlay_ip.into(), From 41491462a776fc387a4adf80fb30c4990c92d54b Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Tue, 10 Jan 2023 13:00:07 -0800 Subject: [PATCH 3/3] moar updates --- sled-agent/src/opte/illumos/firewall_rules.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sled-agent/src/opte/illumos/firewall_rules.rs b/sled-agent/src/opte/illumos/firewall_rules.rs index b7679c57209..4a1cd8011b4 100644 --- a/sled-agent/src/opte/illumos/firewall_rules.rs +++ b/sled-agent/src/opte/illumos/firewall_rules.rs @@ -24,7 +24,7 @@ use oxide_vpc::api::ProtoFilter; use oxide_vpc::api::Protocol; trait FromVpcFirewallRule { - fn action(&self) -> Action; + fn action(&self) -> FirewallAction; fn direction(&self) -> Direction; fn disabled(&self) -> bool; fn hosts(&self) -> Vec
; @@ -34,10 +34,10 @@ trait FromVpcFirewallRule { } impl FromVpcFirewallRule for VpcFirewallRule { - fn action(&self) -> Action { + fn action(&self) -> FirewallAction { match self.action { - VpcFirewallRuleAction::Allow => Action::Allow, - VpcFirewallRuleAction::Deny => Action::Deny, + VpcFirewallRuleAction::Allow => FirewallAction::Allow, + VpcFirewallRuleAction::Deny => FirewallAction::Deny, } }