merge multicast-e2e

Author: zeeshanlakhani

.github/buildomat/common.sh

@@ -1,15 +1,11 @@
 #!/bin/bash
 
-# The tofino2 has 20 stages. Base sidecar.p4 needs 15 stages, and with
-# multicast support it needs 18. Specifying the number of stages isn't strictly
-# necessary, but it allows us to track when we exceed the current ceiling.
-# The underlying intention is to grow deliberately and thoughtfully, given the
-# limited space on the ASIC.
-if [[ "${BUILD_FEATURES:-}" == *"multicast"* ]]; then
-    TOFINO_STAGES=18
-else
-    TOFINO_STAGES=15
-fi
+# The tofino2 has 20 stages. With multicast as a default feature, sidecar.p4
+# needs 18 stages. Specifying the number of stages isn't strictly necessary,
+# but it allows us to track when we exceed the current ceiling. The underlying
+# intention is to grow deliberately and thoughtfully, given the limited space
+# on the ASIC.
+TOFINO_STAGES=18
 
 # These describe which version of the SDE to download and where to find it
 SDE_COMMIT=e61fe02c3c1c384b2e212c90177fcea76a31fd4e

.github/buildomat/illumos.sh

@@ -2,21 +2,12 @@
 banner "sde setup"
 
 export PKG=tofino_sde.p5p
-curl -OL $SDE_DIR/$PKG
-SDE_CALC=`digest -a sha256 $PKG`
-if [ $SDE_CALC != $SDE_PKG_SHA256 ]; then
-	echo "downloaded tofino_sde has a bad checksum"
-	exit 1
-fi
-pfexec pkg install -g $PKG tofino_sde
 
 export SDE=/opt/oxide/tofino_sde
 export LD_LIBRARY_PATH="$SDE/lib:$LD_LIBRARY_PATH"
 
 # Install a couple of non-standard packages needed to build dendrite
 banner "packages"
-pfexec pkg install clang-15 pcap
-pfexec pkg set-mediator -V 15 clang llvm
 
 cargo --version
 rustc --version

.github/buildomat/jobs/image.sh

@@ -101,7 +101,7 @@ pfexec chown "$UID" /out
 
 banner "P4 Codegen"
 # Add gcc-12 so the p4 compiler can find cpp
-PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES
+PATH=/opt/gcc-12/bin:$PATH cargo xtask codegen --stages $TOFINO_STAGES --multicast
 
 # Preserve all the diagnostics spit out by the compiler
 mkdir -p /out/p4c-diags

.github/buildomat/jobs/multicast-test.sh

@@ -30,5 +30,4 @@ set -o errexit
 set -o pipefail
 set -o xtrace
 
-export MULTICAST=1
 source .github/buildomat/packet-test-common.sh

.github/buildomat/packet-test-common.sh

@@ -8,17 +8,11 @@ export WS=$wd
 MODEL_STARTUP_TIMEOUT=${MODEL_STARTUP_TIMEOUT:=5}
 STARTUP_TIMEOUT=${STARTUP_TIMEOUT:=120}
 
-if [[ -z "$MULTICAST" ]]; then
-    BUILD_FEATURES=tofino_asic
-    CODEGEN_FEATURES=
-    SWADM_FEATURES=
-    TOFINO_STAGES=15
-else
-    BUILD_FEATURES=tofino_asic,multicast
-    CODEGEN_FEATURES=--multicast
-    SWADM_FEATURES=--features=multicast
-    TOFINO_STAGES=18
-fi
+BUILD_FEATURES=tofino_asic
+TOFINO_STAGES=18
+
+CODEGEN_FEATURES=--multicast
+SWADM_FEATURES="--features=multicast"
 
 function cleanup {
     set +o errexit

HEAD

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [features]
+default = ["multicast"]
 multicast = []
 
 [dependencies]

aal/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.1.0"
 edition = "2024"
 
 [features]
+default = ["multicast"]
 tofino_asic = [
     "dep:lazy_static",
     "dep:transceiver-controller",

asic/Cargo.toml

@@ -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"]