Skip to content

[mcast, on] default multicast feature across all crates #361

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

Open
zeeshanlakhani wants to merge 1 commit into from
Open

[mcast, on] default multicast feature across all crates #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 0 additions & 34 deletions .github/buildomat/jobs/multicast-test.sh
View file
Open in desktop

This file was deleted.

16 changes: 3 additions & 13 deletions .github/buildomat/packet-test-common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@ STARTUP_TIMEOUT=${STARTUP_TIMEOUT:=120}
DENDRITE_TEST_HOST=${DENDRITE_TEST_HOST:="[::1]"}
DENDRITE_TEST_VERBOSITY=${DENDRITE_TEST_VERBOSITY:=3}

if [ "$MULTICAST" == "" ]; then
BUILD_FEATURES=tofino_asic
CODEGEN_FEATURES=()
SWADM_FEATURES=()
else
BUILD_FEATURES=tofino_asic,multicast
CODEGEN_FEATURES=(--multicast)
SWADM_FEATURES=(--features=multicast)
fi
BUILD_FEATURES=tofino_asic

function cleanup {
set +o errexit
Expand Down Expand Up @@ -64,7 +56,7 @@ export SDE=/opt/oxide/tofino_sde
banner "Build"
if [[ $NOBUILD -ne 1 ]]; then
cargo build --features=$BUILD_FEATURES --bin dpd --bin swadm
cargo xtask codegen --stages "$TOFINO_STAGES" "${CODEGEN_FEATURES[@]}"
cargo xtask codegen --stages "$TOFINO_STAGES"
fi

banner "Test"
Expand Down Expand Up @@ -125,12 +117,10 @@ pushd swadm

cargo test \
--no-fail-fast \
"${SWADM_FEATURES[@]}" \
-- \
--ignored

cargo test \
--no-fail-fast \
"${SWADM_FEATURES[@]}"
--no-fail-fast

popd
1 change: 1 addition & 0 deletions aal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2024"

[features]
default = ["multicast"]
multicast = []

[dependencies]
Expand Down
1 change: 1 addition & 0 deletions asic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ version = "0.1.0"
edition = "2024"

[features]
default = ["multicast"]
tofino_asic = [
"dep:lazy_static",
"dep:transceiver-controller",
Expand Down
1 change: 1 addition & 0 deletions dpd-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ edition = "2024"
description = "Client library for the Dendrite data plane daemon"

[features]
default = ["multicast"]
multicast = ["asic/multicast"]
chaos = ["asic/chaos"]
tofino_asic = ["asic/tofino_asic"]
Expand Down
1 change: 1 addition & 0 deletions dpd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ authors = ["nils <nils@oxide.computer>"]
edition = "2024"

[features]
default = ["multicast"]
multicast = ["aal/multicast", "asic/multicast"]
tofino_asic = ["asic/tofino_asic"]
tofino_stub = ["asic/tofino_stub"]
Expand Down
11 changes: 6 additions & 5 deletions dpd/src/mcast/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2393,15 +2393,16 @@ mod tests {
None
);

// Vec with only Exact sources stays as-is
// Vec with only Exact sources is deduplicated and sorted
let exact_sources = vec![
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1))),
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))),
];
assert_eq!(
canonicalize_sources(Some(exact_sources.clone())),
Some(exact_sources)
);
let expected = vec![
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(10, 0, 0, 1))),
IpSrc::Exact(IpAddr::V4(Ipv4Addr::new(192, 168, 1, 1))),
];
assert_eq!(canonicalize_sources(Some(exact_sources)), Some(expected));

// Single Exact source stays as-is
let single_exact = vec![IpSrc::Exact(IpAddr::V6(Ipv6Addr::new(
Expand Down
1 change: 1 addition & 0 deletions swadm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ authors = ["nils <nils@oxide.computer>"]
edition = "2024"

[features]
default = ["multicast"]
multicast = []

[dependencies]
Expand Down
8 changes: 4 additions & 4 deletions xtask/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ enum XtaskCommands {
#[clap(long)]
stages: Option<u8>,

/// Include support for multicast
/// exclude multicast support from the P4 build
#[clap(long)]
multicast: bool,
no_multicast: bool,
},
/// build an installable dataplane controller package
Dist {
Expand Down Expand Up @@ -251,8 +251,8 @@ async fn main() {
if let Err(e) = match task.subcommand {
XtaskCommands::Openapi(external) => external
.exec_bin("dendrite-dropshot-apis", "dendrite-dropshot-apis"),
XtaskCommands::Codegen { name, sde, stages, multicast } => {
codegen::build(name, sde, stages, multicast)
XtaskCommands::Codegen { name, sde, stages, no_multicast } => {
codegen::build(name, sde, stages, !no_multicast)
}
XtaskCommands::Dist { features, names, release, format } => {
plat::dist(features, names, release, format).await
Expand Down