Skip to content

rev opte to get to a stable build #2146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

rev opte to get to a stable build #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86352ae
rev opte to get to a stable build
ahl Jan 10, 2023
1ea50ee
updates
ahl Jan 10, 2023
4149146
moar updates
ahl Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ 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"
# must match samael's crate!
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" }
Expand Down
10 changes: 5 additions & 5 deletions sled-agent/src/opte/illumos/firewall_rules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Address>;
Expand All @@ -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,
}
}

Expand Down
2 changes: 1 addition & 1 deletion sled-agent/src/opte/illumos/port_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down