Skip to content

Commit ce80ca0

Browse files
lunyue-msCopilot
andcommitted
Remove vpp_promisc.sh; promisc now set via sairedis VPP API
Promiscuous mode on the VPP DPDK physical interfaces is now configured directly through the sairedis VPP API (interface_set_promiscuous, called at LCP pair creation and after bond member enslave) instead of the supervisord-managed vpp_promisc.sh polling script. Remove the now-redundant vpp_promisc.sh / vpp_promisc.conf and their COPY lines from both docker-sonic-vpp and docker-syncd-vpp. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Lun Yue <17232861+lunyue-ms@users.noreply.github.com>
1 parent 14b2b14 commit ce80ca0

6 files changed

Lines changed: 0 additions & 178 deletions

File tree

docker-sonic-vpp/Dockerfile.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,9 @@ RUN mkdir -p /var/log/asan
175175
COPY scripts/start_sonic.sh /usr/local/bin/
176176
COPY scripts/vpp_hostif.sh /usr/local/bin/
177177
COPY scripts/vpp_init.sh /usr/local/bin/
178-
COPY scripts/vpp_promisc.sh /usr/local/bin/
179178
COPY scripts/vppcfg_load.py /usr/local/bin/
180179

181180
COPY conf/vpp_init.conf /etc/supervisor/conf.d/
182-
COPY conf/vpp_promisc.conf /etc/supervisor/conf.d/
183181
COPY conf/startup.conf.tmpl /etc/vpp/
184182
COPY conf/init_cfg.json.j2 /usr/share/sonic/templates/
185183
COPY conf/constants.yml /etc/sonic/

docker-sonic-vpp/conf/vpp_promisc.conf

Lines changed: 0 additions & 10 deletions
This file was deleted.

docker-sonic-vpp/scripts/vpp_promisc.sh

Lines changed: 0 additions & 77 deletions
This file was deleted.

docker-syncd-vpp/Dockerfile.j2

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ COPY ["critical_processes", "/etc/supervisor/"]
3030

3131
COPY scripts/vpp_hostif.sh /usr/local/bin/
3232
COPY scripts/vpp_init.sh /usr/local/bin/
33-
COPY scripts/vpp_promisc.sh /usr/local/bin/
3433

3534
COPY conf/vpp_init.conf /etc/supervisor/conf.d/
36-
COPY conf/vpp_promisc.conf /etc/supervisor/conf.d/
3735
COPY conf/startup.conf.tmpl /etc/vpp/
3836

3937
## Clean up

docker-syncd-vpp/conf/vpp_promisc.conf

Lines changed: 0 additions & 10 deletions
This file was deleted.

docker-syncd-vpp/scripts/vpp_promisc.sh

Lines changed: 0 additions & 77 deletions
This file was deleted.

0 commit comments

Comments
 (0)