Commit a4acce8
[DO-NOT-MERGE][test] VPP: verify sub-port fixes with legacy promisc script
Test-only combo branch for Elastictest regression (pipeline 2818,
t1-lag-vpp). This variant keeps the sub-port/warm-arp sairedis changes but
reverts the one-shot VPP API promisc replacement and restores the legacy
vpp_promisc.sh polling mechanism in platform-vpp.
Submodule pointers:
- src/sonic-sairedis -> 01f35553 (lunyue-ms:lunyue/sub-port-fixes)
sub-port/warm-arp changes kept; 6c8bbf47 promisc API commit removed
- platform/vpp -> f1e0c8a (lunyue-ms:test/restore-vpp-promisc-for-27630)
based on ce80ca0 plus vpp_promisc.sh/conf restored for docker-syncd-vpp
and docker-sonic-vpp
Local validation on vms-kvm-vpp-t1-lag:
- combo with 6c8bbf47: arp/test_neighbor_mac.py 8/12 errors
- this revert-promisc-script image: arp/test_neighbor_mac.py 0/12 errors
.gitmodules URLs for these two submodules are temporarily pointed at the
lunyue-ms forks so CI can fetch the fork-only commits. Not for merge.
Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>1 parent a35c6ed commit a4acce8
3 files changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| |||
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
131 | | - | |
| 131 | + | |
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
| |||
- docker-sonic-vpp/Dockerfile.j2+2
- docker-sonic-vpp/conf/startup.conf.tmpl+8-1
- docker-sonic-vpp/conf/vpp_promisc.conf+10
- docker-sonic-vpp/scripts/vpp_promisc.sh+77
- docker-syncd-vpp/Dockerfile.j2+2
- docker-syncd-vpp/conf/startup.conf.tmpl+8-1
- docker-syncd-vpp/conf/vpp_promisc.conf+10
- docker-syncd-vpp/scripts/vpp_promisc.sh+77
- docs/HLD/SONICVPP-HLD.md+2-1
- docs/HLD/vpp-lag.md+35-2
0 commit comments