From 30b58882e82331af8d61a165ea0f6b981931f70f Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 5 Dec 2024 18:38:24 -0800 Subject: [PATCH 1/2] Start up mgmtd in docker-sonic-vs FRR 10.0.1 upgrade (sonic-net/sonic-buildimage#20269) brought in a mgmtd daemon for FRR. This needs to be started up in docker-sonic-vs as part of the other daemons in this container. Signed-off-by: Saikrishna Arcot --- platform/vs/docker-sonic-vs/start.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh index f28f05f370..f7dbde8dcf 100755 --- a/platform/vs/docker-sonic-vs/start.sh +++ b/platform/vs/docker-sonic-vs/start.sh @@ -160,6 +160,8 @@ supervisorctl start vlanmgrd supervisorctl start zebra +supervisorctl start mgmtd + supervisorctl start staticd supervisorctl start buffermgrd From e12610121344a2ab55695a113a490fd3835f8a4b Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 10 Dec 2024 22:52:38 -0800 Subject: [PATCH 2/2] Use newer version of scapy coming from Debian Signed-off-by: Saikrishna Arcot --- platform/vs/docker-sonic-vs/Dockerfile.j2 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/platform/vs/docker-sonic-vs/Dockerfile.j2 b/platform/vs/docker-sonic-vs/Dockerfile.j2 index e2fd50bfcf..92ba5b06db 100644 --- a/platform/vs/docker-sonic-vs/Dockerfile.j2 +++ b/platform/vs/docker-sonic-vs/Dockerfile.j2 @@ -74,9 +74,8 @@ RUN pip3 uninstall -y enum34 # Dependencies of restore_neighbors.py RUN pip3 install \ - scapy==2.4.4 \ - pyroute2==0.5.14 \ - netifaces==0.10.9 + pyroute2==0.7.2 \ + netifaces==0.11.0 {% if docker_sonic_vs_debs.strip() -%} # Copy built Debian packages