From e8c01341269aee983bf48c724dbced07a0ce9547 Mon Sep 17 00:00:00 2001 From: Aaron Bernardino Date: Wed, 15 Jul 2026 17:29:19 +0000 Subject: [PATCH 1/2] [vpp][DO NOT MERGE] VXLAN L3 dataplane validation image Points src/sonic-sairedis and platform/vpp submodules at validation forks to build a t1-lag-vpp KVM image containing the VXLAN L3 dataplane work for Elastictest validation (GitHub issue sonic-net/sonic-buildimage#25777): - saivpp secondary-VTEP VNET decap term + review fixes H1/H2/M1/M3 (aaronber0614/sonic-sairedis@53976eba) - VPP inner-aware encap hash, underlay ECMP, source-independent VNET decap, review fixes M1/M2/M4, VPP_VERSION 2606-0.6 (aaronber0614/sonic-platform-vpp@592e27d) Draft/validation only. Not for merge; submodules must be restored to sonic-net before any real integration. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3446b9ac-fa7f-4d26-914b-a4f076c603aa --- .gitmodules | 4 ++-- platform/vpp | 2 +- src/sonic-sairedis | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7a75dfb0711..dccb5a9a93d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,7 +6,7 @@ url = https://github.com/sonic-net/sonic-linux-kernel [submodule "sonic-sairedis"] path = src/sonic-sairedis - url = https://github.com/sonic-net/sonic-sairedis + url = https://github.com/aaronber0614/sonic-sairedis.git [submodule "sonic-swss"] path = src/sonic-swss url = https://github.com/sonic-net/sonic-swss @@ -128,7 +128,7 @@ url = https://github.com/Marvell-switching/sonic-platform-marvell.git [submodule "platform/vpp"] path = platform/vpp - url = https://github.com/sonic-net/sonic-platform-vpp.git + url = https://github.com/aaronber0614/sonic-platform-vpp.git [submodule "platform/marvell-prestera/mrvl-prestera"] path = platform/marvell-prestera/mrvl-prestera url = https://github.com/Marvell-switching/mrvl-prestera.git diff --git a/platform/vpp b/platform/vpp index 6949b3ca1e5..592e27d8737 160000 --- a/platform/vpp +++ b/platform/vpp @@ -1 +1 @@ -Subproject commit 6949b3ca1e573de0752c98d8647d43e4e2ceb225 +Subproject commit 592e27d87377d1f26362105f568a7c57d172ea2c diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 7fbebef94da..53976eba64f 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 7fbebef94da8c9a43852856e162033bef5539223 +Subproject commit 53976eba64f9af07c37b57d994b5689cdf139b2a From 63b7c40815694b922b112f5ac07d3b5226aaf269 Mon Sep 17 00:00:00 2001 From: aaronber0614 Date: Thu, 16 Jul 2026 13:27:20 +0000 Subject: [PATCH 2/2] vpp: bump src/sonic-sairedis to include VXLAN BD teardown fix Re-point the src/sonic-sairedis submodule to the cleaned VXLAN enablement branch head (717dd0a5) so the validation image also carries the bridge-domain detach-before-delete teardown fix and the reworded (no tmp1) history. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 3446b9ac-fa7f-4d26-914b-a4f076c603aa --- src/sonic-sairedis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 53976eba64f..717dd0a5b86 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 53976eba64f9af07c37b57d994b5689cdf139b2a +Subproject commit 717dd0a5b861b99d24fc68ec5e75e07c0d9a0551